Now I have a "stable" tree...
still broken...
I'll keep working on this, save the patch, destroy my fork, fork again and repatch

saving some work too...
:wq