PR of initial master commits

perhaps store this in _resumed so we don't loose when the timer originally began.