Squash me with the WIP commit.