start to move into new TimeMachine design