Lenwe

I think it's high time to merge this into master
I don't see nice way to do this, they are quite different.