Started on the army class and removed static assignments from class definitions