add lights, refactoring

Signed-off-by:  <>