could this be pushed into the template expander, I'd like to cut down on the number of non-class functions?