Organization/CW output

Reorganized + finished output of war to command window