Making considerable progress, but still need to make sure the permutations are correct.