add links and stuff not quite working fully