Way better collision handling with solveCollisions