Map Update
Revert "Map Update"

This reverts commit a95dbe686ac05cc30b66cd9d826dc29a9209d98c.
Revert "Revert "Map Update""

This reverts commit 99d384612be4650c6f43b1013607a60370abea9e.
Merge pull request #2 from dagilbert/design

Design