Refactored a lot
Attempted to fix the key listener
Made a lot of things public and static