Initial run through class methods. Need to revisit.

Fuzzy on the class method function/ use case.