Make some progress on yoneda