Switching to a better methodology for class calls.