still a failing build, but have the basic idea for tests and new environment class structure