got most of the changes completed with the exception of iPhone and Android link