Initial steps in converting from template