More work on templating. Now on to the salt stuff.