Progress on battle class