change many links, may be more to catch, so will probably break more stuff out into partials so we can easily see them