As for the other PR, does this need to be on the main index page?