updated @type-links implementation. WORK IN PROGRESS …