Okay then! So what should be the plot as Rin returns? Both are of course aiming for the Olympics still, but how does their relationship develop from his return? How long should it be from Rin's departure until he comes back?

Making Rin Haru's roommate would also would out pretty well for a lot of things.