QP strategy redo
Aug 6th commit