Work on #289.  It doesn't actually do anything yet though.