Started working on battle queue
Redesign of architecture