Starting to get the schema in place