worked on Collision stuff
More collision work
Collision refinements, started fleshing out blocks