Some more progres..
Chaning API is a lot of work.