Moving to yaml config and adding templating