Added some basic collision detection to the objects