Battle state function more complete

The battle state just needs the DB calls, I think.