Major refactoring of OpQueue