Refactor some KO goodness and ditch the extra templates