Military survey class III begin
Finish refactoring-univers-reboot