Added battle controllers and models