Collision refinements, started fleshing out blocks