Okay, @lefticus. I think this is ready for testing (with Radiance).