Modularize templates
Allow changing of variable in results (WIP)