Working collision for player

Still need to tune the collision timing