Finally got past Stage 21 and Stage 22 completed in a tenth of the time. There is definitely some bug with Stage 21 that causes progress to reset.
