Cleanup, more reorg, more arguments, started adding tests Comments and another test Simplify writing of peers and add unit test