More work completed on the C rewrite
More work completed on the C rewrite