more input refactoring

yay!

next update has to make this a game