more linking stuff, getting pretty close