first pass at templating checkpoint
Merge pull request #3 from Bloc/templating-first-pass

first pass at templating checkpoint