Major Changes, lot of bugs / optimizing

(for example, sort the list throw it away and then return the unsorted list.. good plan!)