161214 Introduced generalised Input class

-Refactoring only