A quick skim here but I see what you did with version 2 and I think that's an improvement for clarity. It also helps streamline how much the solo player has to track in play which is always helpful, imo.
Yeah I'm much happier with this version
