[WIP] Start moving towards a DfsRepository-based memory impl