Added preliminary "Order By" functionality