final push. Collision still not working properly