Updated collision function, moved the collision to entites and game state