Anywhere we're calling `return self.X` or `yield self.X` need to be changed to the class reference.
Anywhere we're calling
return self.Xoryield self.Xneed to be changed to the class reference.