Not dead yet! Major refactoring underway
Move includes back into cgp.h, some ops optimizations