Add land/naval battles. Closes #20