almost done with reworking the dictionary