Some changes to bind all steps together. Next step: implement the templates. refs #418