Clarified code and reordered. Can now start testing implementing battle.