My thinking right now is to merge this PR, then we'll need to run the page through a validator soon.