Added some templates that should have been added long ago... my bad.