WIP: start migrating to subdocs