Started adding class based functionality, still getting type errors