Added class for Commander and Scout
Merged Alex and my changes