More template work (these are really descriptive commit messages)