added very basic collisions