collision detection updated, but not finished