At first I thought it was set during the episode "Girl Who Waited," but the last bit brought it back together. Maybe you should tweak your summery to clarified. But I liked how it was written.