Collision revamp - now using repulsion instead of normal force calculations. Much easier!