Lots of updates to support order handling