'Castle' Recap: 'Time Will Tell'

Did Castle and Beckett receive a glimpse of their future in this week’s episode ?
As Beckett and Castle search for the murder of Shauna Taylor, they cross tracks with Simon Doyle. He proclaimed to be from the year 2035. He insists that he was trying to save Shauna because her death would lead to billions dying. Simon said it became his job to go back in time and protect Shauna, after the group he worked with saw spikes in this timeline after another man jumped back to 2013.
At the Shauna’s apartment, a hooker and the manager point the team at Garrett Ward, a soldier type who did not exist until 2007. Ward then kills Shauna’s stepbrother in the course of grilling him about the location of “the child.” After Castle discovers a letter at Ward’s hide the team realize he is seeking high school Paul Deschille, whom Simon says will grow up to create an energy shield that saves humanity during the “Bloody Energy War.” Ward is caught as he tried to kill Deschille, who seems to squelch the time-travel theory by saying Ward was avenging his years-ago arrest and imprisonment. The team accepts this idea, but when Castle goes to give Simon back his futuristic handheld gadget, he disappeared. Did Simon jump to the future?
Back at his apartment, Castle is tired with Pi’s presence and confronts Alexis about the loft situation. She agrees it’s time for a change, and informs Castle she and Pi will be moving in together. Trying to get Beckett to side with him, she shares her two cents that Alexis has seen Castle move in and on with someone and is seeing where she fits in the picture. Before the closing credits, Castle asks Alexis once more to reconsider, but she maintains it is her choice (mistake, if so, to make).