Started adding link functionality