Possibly resolved problems from classing, made a bunch of hashes