merged branch with op queueing implementation