This is very much a work in progress, but the main ideas are here. [MIGRATION] This commit contains a new version of the schema.