WIP gps stuff

Change-Id: I369f0c2f375ea9bb75cdc16708afdf570c81eb3b