Yes. But I understand that since this is the 5th and final season, they didn't have a chance to do that...
Maybe they coul have just pushed that storyline earlier... like... Not just start it an episode before the finale, but maybe 5 episodes before or something.
