Skeletal code comments.
Merge branch 'refactor' into refactor-schema