3A63b: Some remained work on making app standalone.