Began work on abstracting collision handling.