refactoring started, part of the features is still broken
refactoring continues, a lot of features are still broken
finally explorable collection works!