incrememental progress on switching to new db model