All I have left is the medium equipment upgrades, but I think I'd rather work on Whaleship for the 2ndary affection items.