Got lights to work
MERGE OF KEENAN - the mergiest of all the merges