updated to use new shipyard/db