Add the polyfill and all the rest