yuck - can't we get rid of this class soon? What would it take?