trying to implement better collision detection... there are still bugs