More refactoring in moving over to templating facade and moving out the view.