New command structure. Todo fix broken circle claim.