Adding experimental CPP stuff