WIP on remaining missing CC headers