Added some more user input functionality