Completed dbmodel, testing now