Finished collisions, adding tests for it soon