Dmap

Initial set of Dmap changes.