Pulled the persistent server type into a subclass which has really cleaned up the code.  All tests passing.
Readme and fixed an import header.