Refactored to make testing easier.  Added some more tests.  Abstracted configuration reader, to enable testing.