Changed the collision system *kinda

Needs more work but is now playable