* First stab on iOS side * Merge Android and update iOS * Android updates Co-authored-by: Daniel Shokouhi <dshokouhi@gmail.com>