Linking to ObjectController

This is one step toward fixing #1339.