Collision

Update to collision. Still alot of work needed.