Got basic ordering working
merged gordons stuff