Started work on ordering
Ordering now works