more prep for new db model