Try to swap storages in-app

Needs testing because SystemProperties cant be imported in eclipse