Refactor, bug fixes, prep for looping battles