Redid templating system again - now can generate any arbitrary HTML w/o ...

...the JSON being too horrible