Working templates, no direct printing.  Ready to merge to master.