Rewrite of the mongo layer underway, testing left