More Linking Stuff

I'll finish this up tomorrow when everything else is fixed.