Here's some progress on new collision...