Cleaned up logic.
Made geocoding work.