fleshed out db models more