Unify

Unifying the Android and PC modes into one.