Lots of refactoring. UI is a nightmare.
Use dicts instead of lists for all sub collections