I want to get what I had already done rebased correctly before moving CBlock - but yes, definitely that comes immediately after.