...add lazy registration to GoTo...