Add support for time-shifting

So we can have a secondary port, time-shifted from our primary port.

https://www.pivotaltracker.com/story/show/80544126
[Delivers #80544126]