Trying some code for rearranging the combatants by click and drag (which def does not work right now btw)
Fixed merge conflicts