fixed templates for real.  it looks hackish because it is, but it's
functional.