Initial draft moving key creation out of wiki