Sorting now works, still needs UI work
More changes