Finished adding in a lot of affixes