Still working on current location stuff

Giving me issues, i'll try to finish it tomorrow