Features/opq 78

Not being released until April, but I would like to get feedback early.