WIP.  Added form and query custom template tags.