FIXED ALL LINKING! woohoo