Some work on lights (Almost done)