Basic movement, cleaned up