Started adding code to handle legacy links and their content