[CLC-1244] Act as feature

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1244

The slightly tidier pull without all the test cleanup.