Slightly better handling of linkadd, may need to make this more generic in the future