Shayne Terry has an excellent fic available on the archive:

"Time And Again"

You won't be disappointed.