Incorporates feedback from Zee about instance variables and testing.