Re-oreDict'd circuits, closing #26