I think this is a good suggestion, but I'd like to do it as a separate chunk of work.  The template is already in common.