About a third of the way done with #15