This is all the stuff to update the templating engine - get templates working.