-Fixed more JSON spaghetti code.
-Fixed broken LocationService.
-Still quite a few errors to fix as a result of cleanup efforts.