Finished the input manager
Merge branch 'inputs'