Adding port option
More port opt handling
More port opt
More Client constructors for extensibility
Reverting some back to minimize diff
Reverting some back to minimize diff
Miscellaneous
More cleanup
Stuff