Create a class that holds all the table fields and then pass that about rather than passing several fields into all other classes
Ensure that collapse all on multiple fields works as expected