work in progress. Updated UI, still have to clear data befaure relauching the app with adt