Added structure equipment

Lots of different changes