Added some more input stuff and added some code to handle basic collision