Progress.
Fixed some instance variable problems.
Progress
Renaming for clarity
More clarity-reinforcing renaming