Started work on longterm submap changes.