Rework to make this work with builtin sshd server