adding in the ability to jump to a particular spot in the history stack
intent naming change
fixing a nasty merge conflict