no149

Seeing as the two codebases differ in features and one is lagging behind in some areas and we have to maintain two codebases for the mobile and desktop apps, I...