Worked on collisions a bit
Worked on collisions a bit