Lists can now collapse and vice versa
changed collapse function to a class based approach
Solved merge conflicts