More CPP support
Some screen-shots.