For #24, some in last commit as well, split out the plays for better reuse, less repetition