[wip] Detecting collisions
Merge branch 'master' into mark
Collision detection with basic logic for birth/death