WIP mongoose refactor