More work on moving to a single DB paradigm.