Commit before changing everything to hashes... here we go