peer reviewed schema changes... and more

This is an open PR to facilitate the conversation about this schema. There is work to be done here.