location based app
getting ready for merge db