Complete rewrite for the new version of the web