diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
index c37d813..3f8ea5e 100644
--- a/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
+++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Button.java
@@ -1,5 +1,6 @@
 package ru.windcorp.progressia.client.graphics.gui;
 
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import com.google.common.eventbus.Subscribe;
@@ -25,7 +26,7 @@ public class Button extends Component {
 	private boolean isDisabled;
 	private boolean isClicked;
 	
-	public <T extends InputEvent> Button(String name, Font font, String text) {//, InputListener<T> onClick, Class<? extends T> onClickClass) {
+	public <T extends InputEvent> Button(String name, Font font, String text, Consumer<Button> onClick) {//, InputListener<T> onClick, Class<? extends T> onClickClass) {
 		super(name);
 		this.font = font;
 		this.text = text;
@@ -39,12 +40,15 @@ public class Button extends Component {
             }
         });
         
+        Button inButton = this;
+        
         addListener(new Object() {
             @Subscribe
             public void onLeftClick(KeyEvent e) {
             	if (e.isLeftMouseButton())
             	{
             		isClicked = e.isPress();
+            		onClick.accept(inButton);
                 	requestReassembly();
             	}
             }
diff --git a/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java b/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java
index de0bf8c..27a046e 100755
--- a/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java
+++ b/src/main/java/ru/windcorp/progressia/test/LayerTestGUI.java
@@ -59,7 +59,7 @@ public class LayerTestGUI extends GUILayer {
 
 		TestPlayerControls tpc = TestPlayerControls.getInstance();
 		
-		panel.addChild(new Button("TestButton", new Font().withColor(Colors.BLACK), "I'm in TestGUI"));
+		panel.addChild(new Button("TestButton", new Font().withColor(Colors.BLACK), "I'm in TestGUI", b -> {}));
 
 		panel.addChild(
 			new Label(