Finishing out the majority of the primary templates needed in the near future