Added some really basic collision testing
Tidying and adding some objects