Changed war so that it could work separate from GUI