WIP: simpler linking