todo
new client linking code