Some work on constrain_op_complete