MOved remaining light behaviour into light notifier class