updates/move stuff out of non-ssl
updates/move stuff out of non-ssl