client tests passing
pruned irrelevant ssh stuff
removed some uneeded classes
refactor use of patch work so it is in one place