CQA-221: Beginnings of refactoring to start with a list of labels, rather than a list of fields.
CQA-221: Beginnings of refactoring to start with a list of labels, rather than a list of fields.

aronr/Tools,aronr/Tools,aronr/Tools,aronr/Tools,aronr/Tools,aronr/Tools,aronr/Tools