TourGuide stuff

Update linking to support class argument (only for tour guide)