Started working on battling & moves