Added GPS tracking

Need to test