Adding a signup template and new logic