Added polyfill, example wip