Add Input class
Fix a couple things with Input class