Changes for the template files

Still hard coded at this point.