started reworking
Finished reworking InputHandler
After merge commit