Development

Updates for using data from android apk