[New] Commit with most recent work on android crashes