WIP migrating to non-mesh infrastructure