diff --git a/src/sig/engine/KeyBind.java b/src/sig/engine/KeyBind.java
index 91b8aa4..67b2712 100644
--- a/src/sig/engine/KeyBind.java
+++ b/src/sig/engine/KeyBind.java
@@ -3,7 +3,6 @@ package sig.engine;
 import java.util.HashMap;
 import java.util.List;
 
-import net.java.games.input.Controller;
 import net.java.games.input.Component.Identifier;
 import net.java.games.input.Component.POV;
 import sig.RabiClone;
diff --git a/src/sig/engine/Panel.java b/src/sig/engine/Panel.java
index c029b8e..3298b37 100644
--- a/src/sig/engine/Panel.java
+++ b/src/sig/engine/Panel.java
@@ -22,6 +22,7 @@ import java.awt.event.KeyListener;
 
 import sig.DrawLoop;
 import sig.RabiClone;
+import sig.objects.ConfigureControls;
 
 public class Panel extends JPanel implements Runnable,KeyListener {
 	JFrame window;
@@ -403,6 +404,12 @@ public class Panel extends JPanel implements Runnable,KeyListener {
 		if (!Key.isKeyHeld(e.getKeyCode())) {
 			Key.setKeyHeld(e.getKeyCode(), true);
 		}
+		for (Object o : RabiClone.OBJ) {
+			if (o instanceof ConfigureControls) {
+				((ConfigureControls)o).rawKeyPressed(e.getKeyCode());
+				break;
+			}
+		}
 		//System.out.println("Key List: "+KEYS);
 	}
 
diff --git a/src/sig/objects/ConfigureControls.java b/src/sig/objects/ConfigureControls.java
index 07633f7..a4bff00 100644
--- a/src/sig/objects/ConfigureControls.java
+++ b/src/sig/objects/ConfigureControls.java
@@ -3,8 +3,6 @@ package sig.objects;
 import java.awt.event.MouseEvent;
 import java.util.List;
 
-import net.java.games.input.Component;
-import net.java.games.input.Controller;
 import net.java.games.input.Event;
 import net.java.games.input.Component.Identifier;
 import net.java.games.input.Component.POV;
@@ -46,7 +44,7 @@ public class ConfigureControls extends Object{
                     clist.add(new KeyBind((byte)i,id,e.getValue()));
                     KeyBind.KEYBINDS.put(selectedAction,clist);
                     assigningKey=false;
-                }
+                }.
                 //System.out.println(e.getComponent().getName()+" value: "+e.getValue());
             }
         }
@@ -69,6 +67,15 @@ public class ConfigureControls extends Object{
         }
     }
 
+    public void rawKeyPressed(int keyCode) {
+        if (assigningKey) {
+            List<KeyBind> clist = KeyBind.KEYBINDS.get(selectedAction);
+            clist.add(new KeyBind(keyCode));
+            KeyBind.KEYBINDS.put(selectedAction,clist);
+            assigningKey=false;
+        }
+    }
+
     @Override
     protected void MousePressed(MouseEvent e) {
         if (e.getButton()==MouseEvent.BUTTON1) {