Updates to get initial map working.
Merge.