Collision rewrite checkpoint

Major rewrite of collision code for daleks and the Doctor. It's running
but not working correctly.