Battle Edit

Started working on Battle.