Started work on supporting object links