Improving the way templates work.
Working on the template module.