incremental progress toward new db model