Recovering draft 3 because I miss having a working (if sluggish) thing to play with