Progress work on fleshing out the schemas.