Made CC theoretically take intents, but hasn't been tested yet.
Merge branch 'bradley'