[WIP] Work towards being able to do rolling apply