Preliminary work on new templating subsystem - work in progress
Minor improvements and advancements.