More battle stuff, almost done