Basic template fix up

Will work on it more tomorrow