work in progress for CPP rebuild