Add in Input class and make use of throughout
build sync