More work completed on the C rewrite