I think i'll just wait til the time jump after all.  It'll be a bit cleaner that way.