Made a lot of things public in the quest to make this all testable.

Failed most of the tests, we have our work cut out for us.