More Equip

...not perfect yet