Much broader collision support

This toke too long, but was worth it!