make-links! needs testing...