More work on converting everything to Mongoose