whoops. forgot to commit.
Completed templates