Windows app and Android app

In Progress