Excruciating
Redo source split having figured out I was missing a #define...