Everything should be meeting specs at this point.  Made some of the handler logic a little more clear.  On to the server.