More separating sorting code out to separate methods.
Update forge-src to current reccomended for 1.5.1