Re-doing the battle logic to focus more on flow rather than specifics