template-onboarding: refactoring.
template-onboarding: trying to prevent double save.
template-onboarding: refactoring