first code prep for new db structure