More progress on polfill. Currently broken state.