Adding templates and finishing authentication process