iOS/Android Complete

Still Testing Android