InputHandler Todo's
+ Added more todo's