IOS Integration

Need to fix Android issues.