checkpoint - backed out some skeleton code for links