Collision reworked, and splitting square takes care of itself