WIP
merge
android api done