As far as I can tell tonyg ends up with only one list for the tshape type.
Yes, that's right. I believe the design changed to have a single instance of game so there would be a single list of shapes. If there are more instances of game then they should each have a list.