More templating in place

A few other scaffolding things in place. Plus - KITTENS!