It is very awkward to move generals around; you need to move Gen A to a spot away from current position before moving Gen B to that spot. Can't you add a command where they switch positions?