Feature not at war

First pull request - yeah