Hg 69 use one api

There is still some cleanup to do
but maybe you can already spot something that I did that needs to be fixed
@kenkouot @benmai 
you mean this one!
Sorry somehow I did not see it before

I'll look what I can do to make it better