Made all the states private to the classes that use them. Probably broken every test in the process.