Changed how the orderby works. Cleaner now.