switch to jkroso/classes and use yields/merge