First draft of changes to create subclasses for pending ops