lots more work on the order refactor; starting to look promising