Fixing how we pass hashes around