GPS and UI stuff
conflicts
conflicts