still trying to get gpsd/cpgs version of before summer, to master branch