Full update with SSL

Can't auto merge, but these are the necessary changes, so please add them to the repo.