more affix stuff, needs more work