Light design

Change-Id: I2dfcaac34eaa9f86a82b204cc95ef056a1df7eeb
make it compile in the source tree again

Change-Id: I5f79464d8195f748f2edd370f585f4951345f548