Made the new template stuff into a completion block