Hopefully this is close to the last lighting commit for a while