Hashing out more, still messy