KeyListener Implemented

In progress, may need reverting.
Revert "KeyListener Implemented"

This reverts commit 720d9514ddb1e008f2115568b3840e47b6b4e03f.
Merge remote-tracking branch 'origin/master'