Abstracted away the CPA class. Will restructure.