Added Collision

Lots of Changes