More refactoring work
Refactoring base peer's host, port control
Work on getting the test system set up