Initial checkin after splitting this from sshmap