fleshed out models a bit