[WIP] Run through the range again on completion