Some initial hacking at the C part of this feature...