Add links and notes, but unfinished