new implementation of manual ordering

@ajb 
so do i have to create two pull requests now, one from ordering->master and another from master->production?