Put pieces in place for mapping
More map progress.