Rearranging, adding war plugin