Final push for map editor