Work on Illuminage refactor