Refactor, more work on links