Major restructure. New templating primitives. Supplementaries work.
Rework templates to make use of new functionFields