restlink progress + better organisation