Preparing to add SSH functionality, plus a few other stuff