Massive Link Change

Don't ever want to do this again... Should modularize