Refactor input system and breaking things