New scheme is mostly working. Need to fix root method!
"Normal" usage seems to be working. Need to do some testing.