First updates. Addition of map stuff.
Merge.