Reworked and refactored the collision system