added remaining templates, time to hack some perl!