Links are working. Still needs lots of cleanup