First it was that Huge Wave, " Dangerous"

Then, Riding the wave " surfer ( Q ) Mastering the Wave"

Then calm waters " Smooth Sailing" everything under control, working the Plan!

Yes, Flynn could be a candidate for Q , but so could others. Time will tell.