Added links to objects.  Story #235