Interclass Linking ftw

Also fixed bad indentation