[WIP] GPS added