Incomplete implementation of collision detection and some other
miscellaneous features. Mostly just testing to see that committing
works.