Start migrating the app to OTM2 by converting the maps

This is a working draft of the transition