Starting on some collision detection stuff
Merged some changes
Stuff collides now