Split battle class off to another file