rewrote things so files with classes are isolated from code necessary to run things, this was preventing unit tests from running properly