HSTS initial changes

I don't know if this is enough (or wrong), but let me know and I can test.