Everything that was the previous commit but I fixed the collision issue.

The collision detection issue was me being careless with copy+paste…