Merge pull request #1 from Sandtree-Team/Michael

Attempting merge from Michael to Master
Merge pull request #2 from Sandtree-Team/Michael

Default equipment added
Parity with Michael branch
Merge pull request #3 from Sandtree-Team/master

Merge Michael and Main branches