Redoing templating to be more OO friendly