more unification of environment and other lights.  running now but bugs