fleshed out the schema a little