Use a real parser for templates. Rewrite htmltemplate to use the parser (hack, hack). Move the "do_XXX" methods to template_funcs.py. Redo the funcion tests (but not Template tests - they're hopeless). Simplified query form in cgi_client. Ability to delete msgs, files, queries. Ability to edit the metadata on files.