Broke things moving stuff into multiple files.  Worst is the environment pixel test is screwed up.  This is a good example of issues you encounter when refactoring, so will keep the change and fix it