Added entity movement, etc