Cleaned up the GetCurrentLocation class a bit.  I wasn't sure why I had two methods in there.  I need to clean up all of this code a lot.