Brainstorm new logic
Bugfixes

New experimental sorting code (not working)
Fixed Import to same name