Finish moving collision over to new system.

Next step is to consider refactoring some pieces into another class and
to figure out if some parameter passing would save me any grief.