broken android side
Revert "broken android side"

This reverts commit 6af6ee24677bfb0fec079f0fb48fdd697ff45429.
mostly working