Lighting class updated

Nearly finished