Templatize more stuff..