Started working on new features, need to rewrite some more affixes and rearrange some logic