Rewrite the android client