Added Collision

and changed some stuff