refactoring from navgivator stuff.  Some timeline stuff