More work on Order controller