Sorting correct, working on partitioning now