Started refactoring light system