GPS code updates; WIP