Initial push with new template features implemented