Milestone - battle screen mostly done