Ordering functionality added

Note currently commented off in order not to accidently order