Add in some templates
Flesh out and trouble-shoot templates