Adding rest of military units; adding needed attributes; adding aggregate classes