Initial piece for https://jira.media.berkeley.edu/jira/browse/CLC-1349