Made much more progress on this, it's now pretty stable and ready for
wider testing.