Reorganize some of the comments.
Preliminary collision detection working, but needs improvement. #4