Re-added everything because github is a bitch

this includes the json deserializer and the hashing class