crude merging with ssl branch
working ssh