more work on the final collision classes