Collisions almost defragulated

yay