Overlapping/contains progress
Group overhaul
Refactoring, minor changes