Further design/implementation/testing of collision system (issue #8).