added night factory
adding night factory + merge
added lights
merged