Completed (?) movement system with collisions