Added some basic input handling