ok. I'd like to keep it here, then, but put the whole class on the list for a refactor..