161214 More work on Input class

-Refactoring only