dah. now its FunctionHolder and ComparatorHolder. Simple, clean.