This inlcudes slight refactoring and switch to https instead of ftps