Adding in boundaries

Also trying to add in the collision detection.