Refactor links and some of there tests. Work in progress...