Starting to refactor the light