WIP: squash 11, please