5.3.1 working

At this point, the tests pass. Revert to this point is things go crazy
again.