Local->Maps: start moving local to maps.