Fleshed out collision detection. Doesn't build.
[skip ci]