ENH: WIP - To be squashed with apply