Solved Exercise
Commented Fixes

Sorting needs to be fixed.
DS