Still fixing merging issues and changed a few things in the collision detection.