Start on fixing links