cleaned up some names and reorganized the file
added support for GetNewLights
added support for SearchForNewLights
added SetLightState
implemented merge errors
added test for mergeError
map lights