Added some more tags for temp vars and for atoms
Rough outline of generator.