--- a/TODO.txt	Wed Jun 05 13:38:23 2013 -0700
+++ b/TODO.txt	Thu Jul 04 18:24:13 2013 -0700
@@ -1,3 +1,5 @@
+= MakeItSo! TODO =
+
 Planned features:
 
  - Have a filepath or URL as the basic thing that gets "filled". (These
@@ -11,7 +13,7 @@
    def some_helper_func()
 
  - An option to display this at the end of the run:
-   
+
         makeitso -t my/template/ var1=value var2=value
 
    Then you can easily rerun the command
@@ -20,29 +22,32 @@
    filename interpolation);  normally, i'd want '${' + '}', but this
    works poor with, say, bash scripts, and not having this makes it
    difficult to write templates that make other templates
+   ``(This is done in tempita; can we use it?)``
+- 
 
- - should be able to contain as much information as possible in a
-   single file.  Since most often I want to give someone (possibly
-   myself) a single file to run, it would be nice to have some local
-   maximum of the product of flexibility and legibility
+- should be able to contain as much information as possible in a
+  single file.  Since most often I want to give someone (possibly
+  myself) a single file to run, it would be nice to have some local
+  maximum of the product of flexibility and legibility
 
- - the ability to create a self-executing script from a file for easy
-   portability
+- the ability to create a self-executing script from a file for easy
+  portability
 
- - ability to find the variables used in templates;  I find this
-   absolutely critical.  In PasteScript, this isn't there (unless you
-   use cheetah) and it is problematic if you want to deal with
-   templates programmatically.  If you do allow things, like
-   single-file templates, then this becomes mandatory. This is to say,
-   amongst other things, there should be a command-line option that
-   will list the template variables.
+- ability to find the variables used in templates;  I find this
+  absolutely critical.  In PasteScript, this isn't there (unless you
+  use cheetah) and it is problematic if you want to deal with
+  templates programmatically.  If you do allow things, like
+  single-file templates, then this becomes mandatory. This is to say,
+  amongst other things, there should be a command-line option that
+  will list the template variables.
 
- - ability to make existing directory structures or files into
-   templates
+- ability to import templates:
+  ability to make existing directory structures or files into
+  templates
 
- - ability to use defaults (--use-defaults) when they are specified
+- ability to use defaults (--use-defaults) when they are specified
 
- - ability to save variables used in a run into a file: 
+ - ability to save variables used in a run into a file:
 
            makeitso --save-variables=myvars.txt mytemplate
 
@@ -57,7 +62,7 @@
    munge the file extension at all and have other mechanisms for
    denoting files to be interpolated
 
- - ability to use python in interpolation 
+ - ability to use python in interpolation
 
  - backwards compatability with pastescript templates