rework app and add geohelper