Move add_lookups from map to map-builder

In prep for more changes.
2 files changed