Structure better, add links.