design additions and testing on .tpl files. I'm just pushing these up so I'm not forced to stash them before a pull. sorry