Adding CofCs prototypes for testing tomorrow

…also includes some style updates (mainly quick fixes for the testing -
we still need to bring across the latest production styles from Chris