Refactor v2
refactor v3
Work in progress...
Links working
Refactoring plus visualisation