Moved movement into MapObject class