Started adding support for input