Reworking the dictionary. Still not finished.