split state up into some components; fleshing out army a little bit