Did some more work on the order filling