First cut at a rewrite.  Doesn't work yet.