Merge Linda's EAC import changes.
Fix WIP linking functions