Checkpoint before some attempted simplifications
DEBUG flag added to shaders