Further progress on eliminating hashes. Tests do not pass, but almost there.