Begun merge of client server. Server noe serves on multiple ports