Getting closer to fixed.
Looking like it should.