WIP: progress on SingleCardStore/PlayCardStore refactor