Syncing new template code (work in progress) for work from desktop.