More work on the order functionality and api coms.