WIP: Moving modifiers onto particular components.  Armor broken atm.