Starting trying to consolidate linking/access point functionality