Starting to get rid of 'cc' and move all to 'c++'. Doesn't work at all yet.