diff --git a/app/build.gradle b/app/build.gradle
index f34c1fb..6fc80b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 28
     buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.ichangemycity.ichangemycommunity"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -28,6 +28,9 @@ android {
 }
 
 dependencies {
+
+    def camerax_version = "1.0.0-rc01"
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
@@ -64,4 +67,22 @@ dependencies {
 
     // Cluster Markers
     implementation 'com.google.maps.android:android-maps-utils:2.1.0'
+
+    // CameraX core library using camera2 implementation
+    implementation "androidx.camera:camera-camera2:$camerax_version"
+
+    // CameraX Lifecycle Library
+    implementation "androidx.camera:camera-lifecycle:$camerax_version"
+
+    // CameraX View class
+    implementation "androidx.camera:camera-view:1.0.0-alpha20"
+    implementation "androidx.camera:camera-core:${camerax_version}"
+
+    implementation "com.android.support:support-v4:28.0.0"
+    implementation "com.android.support:support-v13:28.0.0"
+    implementation "com.android.support:cardview-v7:28.0.0"
+    implementation "com.android.support:appcompat-v7:28.0.0"
+
+
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b8ff0c2..ccd7868 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-feature android:name="android.hardware.camera.any" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
         android:name=".utils.map.UserClient"
@@ -50,6 +52,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.activities.CameraActivity"/>
 
         <!--
            The API key for Google Maps-based APIs is defined as a string resource.
@@ -72,4 +75,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/model/LuminosityRowItem.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/model/LuminosityRowItem.java
new file mode 100644
index 0000000..436cda5
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/model/LuminosityRowItem.java
@@ -0,0 +1,30 @@
+package com.ichangemycity.ichangemycommunity.model;
+
+import android.graphics.Bitmap;
+
+public class LuminosityRowItem {
+
+    private Bitmap image;
+    private float lumens;
+
+    public LuminosityRowItem(Bitmap image, float lumens) {
+        this.image = image;
+        this.lumens = lumens;
+    }
+
+    public Bitmap getImage() {
+        return image;
+    }
+
+    public float getLumens() {
+        return lumens;
+    }
+
+    public void setImage(Bitmap image) {
+        this.image = image;
+    }
+
+    public void setLumens(float lumens) {
+        this.lumens = lumens;
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/model/SurveyQuestions.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/model/SurveyQuestions.java
new file mode 100644
index 0000000..1518316
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/model/SurveyQuestions.java
@@ -0,0 +1,31 @@
+package com.ichangemycity.ichangemycommunity.model;
+
+import java.util.ArrayList;
+
+//TODO: Modify accordingly. Survey questions model coming from backend
+public class SurveyQuestions {
+
+    private String question;
+    private ArrayList<String> options;
+
+    public SurveyQuestions(String question, ArrayList<String> options) {
+        this.question = question;
+        this.options = options;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public ArrayList<String> getOptions() {
+        return options;
+    }
+
+    public void setOptions(ArrayList<String> options) {
+        this.options = options;
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/activities/CameraActivity.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/activities/CameraActivity.java
new file mode 100644
index 0000000..0a14f65
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/activities/CameraActivity.java
@@ -0,0 +1,113 @@
+package com.ichangemycity.ichangemycommunity.ui.activities;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.ImageCaptureException;
+import androidx.camera.core.Preview;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.utils.camera.CameraUtils;
+
+import java.io.File;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+
+public class CameraActivity extends AppCompatActivity {
+
+    private CameraUtils cameraUtils;
+    private Button mCaptureBtn;
+    private static final String FILENAME = "yyyy-MM-dd-HH-mm-ss-SSS";
+    private static final String PHOTO_EXTENSION = ".jpg";
+    Preview preview;
+    ImageCapture imageCapture;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.camera_activity);
+
+        cameraUtils = new CameraUtils();
+        cameraUtils.verifyStoragePermissions(this);
+        mCaptureBtn = findViewById(R.id.camera_capture_button);
+
+        PreviewView previewView = findViewById(R.id.viewFinder);
+        startCamera(previewView);
+
+        mCaptureBtn.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+            @Override
+            public void onClick(View v) {
+                captureImage();
+            }
+        });
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    private void captureImage() {
+
+        File photoFile = cameraUtils.createFile(cameraUtils.getOutputDirectory(this), FILENAME, PHOTO_EXTENSION);
+
+        ImageCapture.OutputFileOptions outputFileOptions = new ImageCapture.OutputFileOptions.Builder(photoFile).build();
+
+        imageCapture.takePicture(outputFileOptions, Executors.newSingleThreadExecutor(),
+                new ImageCapture.OnImageSavedCallback() {
+                    @Override
+                    public void onImageSaved(ImageCapture.OutputFileResults outputFileResults) {
+                        Uri savedUri = Uri.fromFile(photoFile);
+                    }
+
+                    @Override
+                    public void onError(ImageCaptureException error) {
+                        Log.d("TAG", error.toString());
+
+                    }
+                });
+    }
+
+    private void startCamera(PreviewView previewView) {
+        ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
+        cameraProviderFuture.addListener(() -> {
+            try {
+                ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
+                bindPreviewAndImageCapture(cameraProvider, previewView);
+            } catch (ExecutionException | InterruptedException e) {
+                // No errors need to be handled for this Future.
+                // This should never be reached.
+            }
+        }, ContextCompat.getMainExecutor(this));
+    }
+
+    public void bindPreviewAndImageCapture(@NonNull ProcessCameraProvider cameraProvider, PreviewView previewView) {
+
+        preview = new Preview.Builder().build();
+        imageCapture = new ImageCapture.Builder().setTargetRotation(previewView.getDisplay().getRotation()).build();
+
+
+        CameraSelector cameraSelector = new CameraSelector.Builder()
+                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+                .build();
+
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        cameraProvider.unbindAll();
+        cameraProvider.bindToLifecycle((LifecycleOwner) this, cameraSelector, preview, imageCapture);
+    }
+
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/adapters/LuminosityAdapter.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/adapters/LuminosityAdapter.java
new file mode 100644
index 0000000..e482281
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/adapters/LuminosityAdapter.java
@@ -0,0 +1,62 @@
+package com.ichangemycity.ichangemycommunity.ui.adapters;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.model.LuminosityRowItem;
+
+public class LuminosityAdapter extends RecyclerView.Adapter<LuminosityAdapter.ViewHolder> {
+
+    private LuminosityRowItem luminosityData[];
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        private final TextView thumbnailText;
+        private final ImageView thumbnail;
+
+        public ViewHolder(View view) {
+            super(view);
+            thumbnail = view.findViewById(R.id.thumbnail);
+            thumbnailText = view.findViewById(R.id.thumbnail_text);
+        }
+
+        public TextView getThumbnailText() {
+            return thumbnailText;
+        }
+
+        public ImageView getThumbnail() {
+            return thumbnail;
+        }
+    }
+
+    public LuminosityAdapter(LuminosityRowItem luminosityData[]) {
+        this.luminosityData = luminosityData;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.recycler_view_item, parent, false);
+
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.thumbnail.setImageBitmap(luminosityData[position].getImage());
+        holder.thumbnailText.setText(luminosityData[position].getLumens() + " Lumens");
+    }
+
+    @Override
+    public int getItemCount() {
+        return luminosityData.length;
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/adapters/SurveyQuestionsAdapter.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/adapters/SurveyQuestionsAdapter.java
new file mode 100644
index 0000000..b92af58
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/adapters/SurveyQuestionsAdapter.java
@@ -0,0 +1,64 @@
+package com.ichangemycity.ichangemycommunity.ui.adapters;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.model.LuminosityRowItem;
+import com.ichangemycity.ichangemycommunity.model.SurveyQuestions;
+
+public class SurveyQuestionsAdapter extends RecyclerView.Adapter<SurveyQuestionsAdapter.ViewHolder> {
+
+    private SurveyQuestions surveyQuestions[];
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        private final TextView question;
+        private final RadioGroup options;
+
+        public ViewHolder(View view) {
+            super(view);
+            options = view.findViewById(R.id.thumbnail);
+            question = view.findViewById(R.id.thumbnail_text);
+        }
+
+        public TextView getQuestion() {
+            return question;
+        }
+
+        public RadioGroup getOptions() {
+            return options;
+        }
+    }
+
+    public SurveyQuestionsAdapter(SurveyQuestions surveyQuestions[]) {
+        this.surveyQuestions = surveyQuestions;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.recycler_view_item, parent, false);
+
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+
+        /*holder.options.setImageBitmap(surveyQuestions[position].getImage());
+        holder.question.setText(surveyQuestions[position].getLumens() + " Lumens");*/
+    }
+
+    @Override
+    public int getItemCount() {
+        return surveyQuestions.length;
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/CameraFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/CameraFragment.java
new file mode 100644
index 0000000..beafe9c
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/CameraFragment.java
@@ -0,0 +1,146 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.ImageCaptureException;
+import androidx.camera.core.Preview;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
+import com.ichangemycity.ichangemycommunity.utils.camera.CameraUtils;
+import com.ichangemycity.ichangemycommunity.utils.map.MapInputContainerEnum;
+import com.ichangemycity.ichangemycommunity.utils.map.SurveyDropDownEnum;
+import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
+import java.io.File;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+
+public class CameraFragment extends Fragment {
+
+    private static final String TAG = CameraFragment.class.getSimpleName();
+    private UserClient userClient;
+    private ReplaceInputContainerListener replaceInputContainerListener;
+    private CameraUtils cameraUtils;
+    private Button mCaptureBtn;
+    private static final String FILENAME = "yyyy-MM-dd-HH-mm-ss-SSS";
+    private static final String PHOTO_EXTENSION = ".jpg";
+    Preview preview;
+    ImageCapture imageCapture;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userClient = (UserClient) getContext().getApplicationContext();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.camera_activity, null, false);
+        cameraUtils = new CameraUtils();
+        cameraUtils.verifyStoragePermissions(requireActivity());
+        mCaptureBtn = view.findViewById(R.id.camera_capture_button);
+
+        PreviewView previewView = view.findViewById(R.id.viewFinder);
+        startCamera(previewView);
+
+        mCaptureBtn.setOnClickListener(new View.OnClickListener() {
+            @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+            @Override
+            public void onClick(View v) {
+                captureImage();
+            }
+        });
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        replaceInputContainerListener = (ReplaceInputContainerListener) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        replaceInputContainerListener = null;
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    private void captureImage() {
+
+        File photoFile =  cameraUtils.getOutputDirectory(requireContext()); //cameraUtils.createFile(cameraUtils.getOutputDirectory(requireContext()), FILENAME, PHOTO_EXTENSION);
+
+        ImageCapture.OutputFileOptions outputFileOptions = new ImageCapture.OutputFileOptions.Builder(photoFile).build();
+
+        imageCapture.takePicture(outputFileOptions, Executors.newSingleThreadExecutor(),
+                new ImageCapture.OnImageSavedCallback() {
+
+                    @Override
+                    public void onImageSaved(ImageCapture.OutputFileResults outputFileResults) {
+                        Uri savedUri = Uri.fromFile(photoFile);
+                    }
+
+                    @Override
+                    public void onError(ImageCaptureException error) {
+                        Log.d("TAG", error.toString());
+
+                    }
+                });
+    }
+
+    private void startCamera(PreviewView previewView) {
+        ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext());
+        cameraProviderFuture.addListener(() -> {
+            try {
+                ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
+                bindPreviewAndImageCapture(cameraProvider, previewView);
+            } catch (ExecutionException | InterruptedException e) {
+                // No errors need to be handled for this Future.
+                // This should never be reached.
+            }
+        }, ContextCompat.getMainExecutor(requireContext()));
+    }
+
+    public void bindPreviewAndImageCapture(@NonNull ProcessCameraProvider cameraProvider, PreviewView previewView) {
+
+        preview = new Preview.Builder().build();
+        imageCapture = new ImageCapture.Builder().setTargetRotation(previewView.getDisplay().getRotation()).build();
+
+
+        CameraSelector cameraSelector = new CameraSelector.Builder()
+                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+                .build();
+
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        cameraProvider.unbindAll();
+        cameraProvider.bindToLifecycle((LifecycleOwner) this, cameraSelector, preview, imageCapture);
+    }
+
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/ChooseSurveyFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/ChooseSurveyFragment.java
new file mode 100644
index 0000000..959ce89
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/ChooseSurveyFragment.java
@@ -0,0 +1,79 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
+import com.ichangemycity.ichangemycommunity.utils.map.MapInputContainerEnum;
+import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
+public class ChooseSurveyFragment extends Fragment implements View.OnClickListener {
+    private static final String TAG = LuminosityFragment.class.getSimpleName();
+    private UserClient userClient;
+    private ReplaceInputContainerListener replaceInputContainerListener;
+
+    private Button mToiletsBtn;
+    private Button mSeatingBtn;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userClient = (UserClient) getContext().getApplicationContext();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_choose_survey, null, false);
+        mToiletsBtn = view.findViewById(R.id.take_survey_toilets_button);
+        mToiletsBtn.setOnClickListener(this::onClick);
+        mSeatingBtn = view.findViewById(R.id.take_survey_seating_button);
+        mSeatingBtn.setOnClickListener(this::onClick);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        replaceInputContainerListener = (ReplaceInputContainerListener) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        replaceInputContainerListener = null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.take_survey_toilets_button:
+                //TODO: Call to backend to fetch questions
+                userClient.setMapInputContainerEnum(MapInputContainerEnum.SurveyQuestionsFragment);
+                replaceInputContainerListener.onReplaceInputContainer();
+                break;
+
+            case R.id.take_survey_seating_button:
+                //TODO: Call to backend to fetch questions
+                userClient.setMapInputContainerEnum(MapInputContainerEnum.SurveyQuestionsFragment);
+                replaceInputContainerListener.onReplaceInputContainer();
+                break;
+
+        }
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/LuminosityFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/LuminosityFragment.java
new file mode 100644
index 0000000..090c61c
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/LuminosityFragment.java
@@ -0,0 +1,133 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
+import com.ichangemycity.ichangemycommunity.utils.camera.CameraUtils;
+import com.ichangemycity.ichangemycommunity.utils.map.MapInputContainerEnum;
+import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
+public class LuminosityFragment extends Fragment implements View.OnClickListener {
+    private static final String TAG = LuminosityFragment.class.getSimpleName();
+    private UserClient userClient;
+    private ReplaceInputContainerListener replaceInputContainerListener;
+
+    private Button mOpenCameraBtn;
+    private Button mBackHomeBtn;
+    private CameraUtils cameraUtils;
+    static final int REQUEST_CODE_PERMISSIONS = 10;
+    private static final int CAMERA_REQUEST = 1888;
+    private ImageView imageView;
+    private static final int MY_CAMERA_PERMISSION_CODE = 100;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userClient = (UserClient) getContext().getApplicationContext();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_luminosity, null, false);
+
+        mOpenCameraBtn = view.findViewById(R.id.open_camera_button);
+        mOpenCameraBtn.setOnClickListener(this::onClick);
+        mBackHomeBtn = view.findViewById(R.id.back_home_button);
+        mBackHomeBtn.setOnClickListener(this::onClick);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        replaceInputContainerListener = (ReplaceInputContainerListener) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        replaceInputContainerListener = null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.open_camera_button:
+                cameraUtils = new CameraUtils();
+                if (cameraUtils.isCameraPermissionGranted(requireActivity())) {
+                    Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+                    startActivityForResult(cameraIntent, CAMERA_REQUEST);
+                } else {
+                    cameraUtils.requestCameraPermission(requireActivity());
+                }
+                break;
+
+            case R.id.back_home_button:
+                // TODO: action on home button
+                break;
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == MY_CAMERA_PERMISSION_CODE) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(requireActivity(), "camera permission granted", Toast.LENGTH_LONG).show();
+                Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+                startActivityForResult(cameraIntent, CAMERA_REQUEST);
+            } else {
+                Toast.makeText(requireActivity(), "camera permission denied", Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == CAMERA_REQUEST && resultCode == Activity.RESULT_OK) {
+            Bitmap photo = (Bitmap) data.getExtras().get("data");
+            Bundle bundle = new Bundle();
+            bundle.putParcelable("thumbnail", photo);
+            userClient.setMapInputContainerEnum(MapInputContainerEnum.LuminosityProgressFragment);
+            userClient.setBundle(bundle);
+            replaceInputContainerListener.onReplaceInputContainer();
+            //imageView.setImageBitmap(photo);
+        }
+    }
+    /*@Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == REQUEST_CODE_PERMISSIONS) {
+            if (cameraUtils.isCameraPermissionGranted(requireActivity())) {
+                Intent i = new Intent(getActivity(), CameraActivity.class);
+                startActivity(i);
+            } else {
+                Toast.makeText(requireActivity(), "Permissions not granted by the user.", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }*/
+
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/LuminosityProgressFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/LuminosityProgressFragment.java
new file mode 100644
index 0000000..daaa024
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/LuminosityProgressFragment.java
@@ -0,0 +1,177 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
+import com.ichangemycity.ichangemycommunity.utils.camera.CameraUtils;
+import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
+import static android.content.Context.SENSOR_SERVICE;
+
+public class LuminosityProgressFragment extends Fragment implements View.OnClickListener, SensorEventListener {
+    private static final String TAG = LuminosityFragment.class.getSimpleName();
+    private UserClient userClient;
+    private ReplaceInputContainerListener replaceInputContainerListener;
+
+    private Button mTakeAnotherPhotoBtn;
+    private Button mSubmitBtn;
+    private Button mDeletePhotoBtn;
+    private ImageView thumbnail;
+    private TextView thumbnailText;
+    private CameraUtils cameraUtils;
+    static final int REQUEST_CODE_PERMISSIONS = 10;
+    private static final int CAMERA_REQUEST = 1888;
+    private ImageView imageView;
+    private static final int MY_CAMERA_PERMISSION_CODE = 100;
+    private SensorManager mSensorManager;
+    private Sensor mLuminosity;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userClient = (UserClient) getContext().getApplicationContext();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_luminosity_progress, null, false);
+
+        mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);
+        mLuminosity = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+
+        thumbnail = view.findViewById(R.id.thumbnail);
+        thumbnailText = view.findViewById(R.id.thumbnail_text);
+        thumbnail.setImageBitmap(getArguments().getParcelable("thumbnail"));
+        mTakeAnotherPhotoBtn = view.findViewById(R.id.take_another_photo_button);
+        mTakeAnotherPhotoBtn.setOnClickListener(this::onClick);
+        mSubmitBtn = view.findViewById(R.id.submit_luminosity);
+        mSubmitBtn.setOnClickListener(this::onClick);
+        mDeletePhotoBtn = view.findViewById(R.id.delete_photo_button);
+        mDeletePhotoBtn.setOnClickListener(this::onClick);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        replaceInputContainerListener = (ReplaceInputContainerListener) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        replaceInputContainerListener = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSensorManager.registerListener(this, mLuminosity, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSensorManager.unregisterListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.take_another_photo_button:
+                cameraUtils = new CameraUtils();
+                if (cameraUtils.isCameraPermissionGranted(requireActivity())) {
+                    Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+                    startActivityForResult(cameraIntent, CAMERA_REQUEST);
+                } else {
+                    cameraUtils.requestCameraPermission(requireActivity());
+                }
+                break;
+
+            case R.id.delete_photo_button:
+                mSubmitBtn.setEnabled(false);
+                thumbnail.setVisibility(View.GONE);
+                thumbnailText.setVisibility(View.GONE);
+                mDeletePhotoBtn.setVisibility(View.GONE);
+                Toast.makeText(requireContext(), "Please take another image", Toast.LENGTH_LONG).show();
+
+            case R.id.submit_luminosity:
+                // TODO: action on home button
+                break;
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == MY_CAMERA_PERMISSION_CODE) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(requireActivity(), "camera permission granted", Toast.LENGTH_LONG).show();
+                Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+                startActivityForResult(cameraIntent, CAMERA_REQUEST);
+            } else {
+                Toast.makeText(requireActivity(), "camera permission denied", Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == CAMERA_REQUEST && resultCode == Activity.RESULT_OK) {
+            Bitmap photo = (Bitmap) data.getExtras().get("data");
+            thumbnail.setVisibility(View.VISIBLE);
+            thumbnail.setImageBitmap(photo);
+            if(!mSubmitBtn.isEnabled())
+                mSubmitBtn.setEnabled(true);
+            mDeletePhotoBtn.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent sensorEvent) {
+
+        if (sensorEvent.sensor.getType() == Sensor.TYPE_LIGHT) {
+            float currentReading = sensorEvent.values[0];
+            thumbnailText.setVisibility(View.VISIBLE);
+            thumbnailText.setText(currentReading + " Lumens");
+            mSensorManager.unregisterListener(this);
+            if(!mSubmitBtn.isEnabled())
+                mSubmitBtn.setEnabled(true);
+        }
+    }
+
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int i) {
+
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/PublicAmenitiesFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/PublicAmenitiesFragment.java
new file mode 100644
index 0000000..0b8d869
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/PublicAmenitiesFragment.java
@@ -0,0 +1,83 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
+import com.ichangemycity.ichangemycommunity.utils.camera.CameraUtils;
+import com.ichangemycity.ichangemycommunity.utils.map.MapInputContainerEnum;
+import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
+public class PublicAmenitiesFragment extends Fragment implements View.OnClickListener {
+    private static final String TAG = LuminosityFragment.class.getSimpleName();
+    private UserClient userClient;
+    private ReplaceInputContainerListener replaceInputContainerListener;
+
+    private Button mProceedToLocationBtn;
+    private Button mBackHomeBtn;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userClient = (UserClient) getContext().getApplicationContext();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragement_public_amenities, null, false);
+
+        mProceedToLocationBtn = view.findViewById(R.id.proceed_to_location);
+        mProceedToLocationBtn.setOnClickListener(this::onClick);
+        mBackHomeBtn = view.findViewById(R.id.back_home_button);
+        mBackHomeBtn.setOnClickListener(this::onClick);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        replaceInputContainerListener = (ReplaceInputContainerListener) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        replaceInputContainerListener = null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.proceed_to_location:
+                userClient.setMapInputContainerEnum(MapInputContainerEnum.PublicAmenitiesProgressFragment);
+                replaceInputContainerListener.onReplaceInputContainer();
+
+            case R.id.back_home_button:
+                // TODO: action on home button
+                break;
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/PublicAmenitiesProgressFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/PublicAmenitiesProgressFragment.java
new file mode 100644
index 0000000..3bd37ca
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/PublicAmenitiesProgressFragment.java
@@ -0,0 +1,69 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ichangemycity.ichangemycommunity.R;
+import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
+import com.ichangemycity.ichangemycommunity.utils.map.MapInputContainerEnum;
+import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
+public class PublicAmenitiesProgressFragment extends Fragment implements View.OnClickListener {
+    private static final String TAG = LuminosityFragment.class.getSimpleName();
+    private UserClient userClient;
+    private ReplaceInputContainerListener replaceInputContainerListener;
+
+    private Button mConfirmLocationBtn;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userClient = (UserClient) getContext().getApplicationContext();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_progress_public_amenities, null, false);
+        mConfirmLocationBtn = view.findViewById(R.id.confirm_location_button);
+        mConfirmLocationBtn.setOnClickListener(this::onClick);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        replaceInputContainerListener = (ReplaceInputContainerListener) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        replaceInputContainerListener = null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.confirm_location_button:
+                userClient.setMapInputContainerEnum(MapInputContainerEnum.ChooseSurveyFragment);
+                replaceInputContainerListener.onReplaceInputContainer();
+
+                break;
+        }
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyCategoryFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyCategoryFragment.java
index a1e08df..081348e 100644
--- a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyCategoryFragment.java
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyCategoryFragment.java
@@ -1,18 +1,22 @@
 package com.ichangemycity.ichangemycommunity.ui.fragments;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+
 import com.ichangemycity.ichangemycommunity.R;
 import com.ichangemycity.ichangemycommunity.ui.listeners.ReplaceInputContainerListener;
 import com.ichangemycity.ichangemycommunity.utils.map.MapInputContainerEnum;
 import com.ichangemycity.ichangemycommunity.utils.map.SurveyDropDownEnum;
 import com.ichangemycity.ichangemycommunity.utils.map.UserClient;
+
 public class SurveyCategoryFragment extends Fragment implements View.OnClickListener {
     private static final String TAG = SurveyCategoryFragment.class.getSimpleName();
     private UserClient userClient;
@@ -20,11 +24,13 @@ public class SurveyCategoryFragment extends Fragment implements View.OnClickList
     private Button walkabilityButton;
     private Button visibilityButton;
     private Button drivabilityButton;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         userClient = (UserClient) getContext().getApplicationContext();
     }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -37,20 +43,24 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         drivabilityButton.setOnClickListener(this::onClick);
         return view;
     }
+
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
     }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         replaceInputContainerListener = (ReplaceInputContainerListener) context;
     }
+
     @Override
     public void onDetach() {
         super.onDetach();
         replaceInputContainerListener = null;
     }
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -60,15 +70,15 @@ public void onClick(View v) {
                 replaceInputContainerListener.onReplaceInputContainer();
                 break;
             case R.id.drivability:
-                userClient.setSurveyCategory(SurveyDropDownEnum.Drivability);
-                userClient.setMapInputContainerEnum(MapInputContainerEnum.DrivabilityFragment);
+                userClient.setSurveyCategory(SurveyDropDownEnum.PublicAmenities);
+                userClient.setMapInputContainerEnum(MapInputContainerEnum.PublicAmenitiesFragment);
                 replaceInputContainerListener.onReplaceInputContainer();
                 break;
             case R.id.visibility:
-                userClient.setSurveyCategory(SurveyDropDownEnum.Visibility);
-                userClient.setMapInputContainerEnum(MapInputContainerEnum.VisibilityFragment);
+                userClient.setSurveyCategory(SurveyDropDownEnum.Luminosity);
+                userClient.setMapInputContainerEnum(MapInputContainerEnum.LuminosityFragment);
                 replaceInputContainerListener.onReplaceInputContainer();
                 break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyHomeFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyHomeFragment.java
index 4c6ec06..3e14a63 100644
--- a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyHomeFragment.java
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyHomeFragment.java
@@ -40,6 +40,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
     private void renderInputViewContainer() {
         mapInputContainerEnum = userClient.getMapInputContainerEnum();
+        Bundle bundle = userClient.getBundle();
+
         switch (mapInputContainerEnum) {
             case LoaderFragment:
                 fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new LoaderFragment());
@@ -53,6 +55,12 @@ private void renderInputViewContainer() {
             case VisibilityFragment:
                 fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new VisibilityFragment());
                 break;
+            case LuminosityFragment:
+                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new LuminosityFragment());
+                break;
+            case PublicAmenitiesFragment:
+                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new PublicAmenitiesFragment());
+                break;
             case DrivabilityFragment:
                 fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new DrivabilityFragment());
                 break;
@@ -60,6 +68,21 @@ private void renderInputViewContainer() {
                 fragmentUtils.replaceFragment(R.id.map_view_container, TAG, getFragmentManager(), new MapViewFragment());
                 fragmentUtils.replaceFragment(R.id.input_view_container, TAG, getFragmentManager(), new SurveyFormFragment());
                 break;
+            case CameraFragment:
+                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new CameraFragment());
+                break;
+            case LuminosityProgressFragment:
+                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), bundle, new LuminosityProgressFragment());
+                break;
+            case PublicAmenitiesProgressFragment:
+                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new PublicAmenitiesProgressFragment());
+                break;
+            case ChooseSurveyFragment:
+                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new ChooseSurveyFragment());
+                break;
+//            case SurveyQuestionsFragment:
+//                fragmentUtils.replaceFragment(R.id.surveyHomeContainer, TAG, getFragmentManager(), new SurveyQuestionsFragment());
+//                break;
             case Unknown:
                 try {
                     throw new IOException();
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyQuestionsFragment.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyQuestionsFragment.java
new file mode 100644
index 0000000..ca83f8f
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/ui/fragments/SurveyQuestionsFragment.java
@@ -0,0 +1,4 @@
+package com.ichangemycity.ichangemycommunity.ui.fragments;
+
+public class SurveyQuestionsFragment {
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/FragmentUtils.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/FragmentUtils.java
index 9e09773..28cb2b8 100644
--- a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/FragmentUtils.java
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/FragmentUtils.java
@@ -1,5 +1,7 @@
 package com.ichangemycity.ichangemycommunity.utils;
 
+import android.os.Bundle;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -19,4 +21,12 @@ public void replaceFragment(int containerId, String source, FragmentManager frag
         // Commit the Fragment replace action.
         fragmentTransaction.commit();
     }
+
+    public void replaceFragment(int containerId, String source, FragmentManager fragmentManager, Bundle extras, Fragment destination) {
+
+        //pass some extras to the destination
+        destination.setArguments(extras);
+
+        replaceFragment(containerId, source, fragmentManager, destination);
+    }
 }
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/camera/CameraUtils.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/camera/CameraUtils.java
new file mode 100644
index 0000000..8e21846
--- /dev/null
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/camera/CameraUtils.java
@@ -0,0 +1,83 @@
+package com.ichangemycity.ichangemycommunity.utils.camera;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Environment;
+import android.util.Log;
+
+import androidx.annotation.RequiresApi;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.ichangemycity.ichangemycommunity.R;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+public class CameraUtils {
+
+    static final int REQUEST_CODE_PERMISSIONS = 10;
+    static final int REQUEST_EXTERNAL_STORAGE = 1;
+    static String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+    };
+
+    static final double RATIO_4_3_VALUE = 4.0 / 3.0;
+    static final double RATIO_16_9_VALUE = 16.0 / 9.0;
+    static final String CAMERA_PERMISSIONS[] = {Manifest.permission.CAMERA};
+
+    public boolean isCameraPermissionGranted(Activity context) {
+        return ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    public void requestCameraPermission(Activity context) {
+        ActivityCompat.requestPermissions(
+                context, CAMERA_PERMISSIONS, REQUEST_CODE_PERMISSIONS);
+    }
+
+    public void verifyStoragePermissions(Activity activity) {
+        int permission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+
+        if (permission != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(
+                    activity,
+                    PERMISSIONS_STORAGE,
+                    REQUEST_EXTERNAL_STORAGE
+            );
+        }
+    }
+
+    public File createFile(File baseFolder, String format, String extension) {
+        return new File(baseFolder, new SimpleDateFormat(format, Locale.US).format(System.currentTimeMillis()) + extension);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public File getOutputDirectory(Context context) {
+
+        Context appContext = context.getApplicationContext();
+        String fileName = String.valueOf(System.currentTimeMillis()) + ".jpg";
+        File mediaStorageDir = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), appContext.getResources().getString(R.string.app_name));
+
+        // Create the storage directory if it does not exist
+        if (!mediaStorageDir.exists() && !mediaStorageDir.mkdirs()){
+            Log.d("APP_TAG", "failed to create directory");
+        }
+
+        // Return the file target for the photo based on filename
+        File file = new File(mediaStorageDir.getPath() + File.separator + fileName);
+
+        return file;
+        /*Context appContext = context.getApplicationContext();
+        File[] mediaDir = context.getExternalMediaDirs();
+        if (mediaDir != null) {
+            File file = new File(mediaDir[0], appContext.getResources().getString(R.string.app_name));
+            return file;
+        }
+        return appContext.getFilesDir();*/
+    }
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/MapInputContainerEnum.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/MapInputContainerEnum.java
index 13a3f0c..3c9086b 100644
--- a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/MapInputContainerEnum.java
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/MapInputContainerEnum.java
@@ -10,5 +10,12 @@ public enum MapInputContainerEnum implements Serializable {
     VisibilityFragment,
     DrivabilityFragment,
     SurveyFormFragment,
-    Unknown;
-}
\ No newline at end of file
+    CameraFragment,
+    LuminosityFragment,
+    LuminosityProgressFragment,
+    PublicAmenitiesFragment,
+    PublicAmenitiesProgressFragment,
+    ChooseSurveyFragment,
+    SurveyQuestionsFragment,
+    Unknown
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/SurveyDropDownEnum.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/SurveyDropDownEnum.java
index 2a90fc5..2de1562 100644
--- a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/SurveyDropDownEnum.java
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/SurveyDropDownEnum.java
@@ -7,5 +7,6 @@ public enum SurveyDropDownEnum implements Serializable {
     Walkability,
     Visibility,
     Drivability,
-    Unknown;
-}
\ No newline at end of file
+    Luminosity,
+    PublicAmenities
+}
diff --git a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/UserClient.java b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/UserClient.java
index 6b3cad1..d00fb37 100644
--- a/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/UserClient.java
+++ b/app/src/main/java/com/ichangemycity/ichangemycommunity/utils/map/UserClient.java
@@ -1,6 +1,7 @@
 package com.ichangemycity.ichangemycommunity.utils.map;
 
 import android.app.Application;
+import android.os.Bundle;
 import android.util.Log;
 
 import com.google.android.gms.maps.model.LatLng;
@@ -21,6 +22,7 @@ public class UserClient extends Application {
     private LatLng userLatLng;
     private boolean isInitialBroadcast = true;
     private MapInputContainerEnum mapInputContainerEnum;
+    private Bundle bundle;
     private Map<SurveyDropDownEnum, List<Survey>> surveyMap = new HashMap<>();
     private List<String> surveyDropDownList = new ArrayList<>();
     private Survey survey;
@@ -30,6 +32,10 @@ public MapInputContainerEnum getMapInputContainerEnum() {
         return mapInputContainerEnum;
     }
 
+    public Bundle getBundle(){
+        return bundle;
+    }
+
     // Retrieve user details from db, mocked driver details are fetched below
     public User fetchUser() {
         user = new User("Citizen", true, "Citizen", "citizen@gmail.com", "1234567890", R.drawable.ic_driver_pin, 4.5, null, getCurrentTimeStamp());
@@ -75,6 +81,10 @@ public void setMapInputContainerEnum(MapInputContainerEnum mapInputContainerEnum
         this.mapInputContainerEnum = mapInputContainerEnum;
     }
 
+    public void setBundle(Bundle bundle) {
+        this.bundle = bundle;
+    }
+
     public String getCurrentTimeStamp() {
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss");
diff --git a/app/src/main/res/drawable/rounded_button_yellow.xml b/app/src/main/res/drawable/rounded_button_yellow.xml
index 0aca962..b17eedd 100644
--- a/app/src/main/res/drawable/rounded_button_yellow.xml
+++ b/app/src/main/res/drawable/rounded_button_yellow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
+    <item android:state_enabled="true">
         <shape android:shape="rectangle">
             <!--make a gradient background-->
             <gradient
@@ -10,7 +10,20 @@
                 android:angle="0"
                 />
 
-            <corners android:radius="24dp"/>
+            <corners android:radius="8dp"/>
         </shape>
     </item>
-</selector>
\ No newline at end of file
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <!--make a gradient background-->
+            <gradient
+                android:type="linear"
+                android:startColor="@color/darkGrey"
+                android:endColor="@color/greyTrack"
+                android:angle="0"
+                />
+
+            <corners android:radius="8dp"/>
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/camera_activity.xml b/app/src/main/res/layout/camera_activity.xml
new file mode 100644
index 0000000..7499327
--- /dev/null
+++ b/app/src/main/res/layout/camera_activity.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <Button
+        android:id="@+id/camera_capture_button"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginBottom="50dp"
+        android:scaleType="fitCenter"
+        android:text="Take Photo"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:elevation="2dp" />
+
+    <androidx.camera.view.PreviewView
+        android:id="@+id/viewFinder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragement_public_amenities.xml b/app/src/main/res/layout/fragement_public_amenities.xml
new file mode 100644
index 0000000..66fc62a
--- /dev/null
+++ b/app/src/main/res/layout/fragement_public_amenities.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_searching_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="20dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="36dp"
+            android:fontFamily="sans-serif"
+            android:gravity="center_horizontal"
+            android:text="@string/heading_public_amenities"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/heading"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="44dp"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_horizontal"
+            android:text="@string/quick_description"
+            android:textColor="#333333"
+            android:textSize="16sp"
+            android:textStyle="normal" />
+
+
+        <Button
+            android:id="@+id/proceed_to_location"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/description"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/proceed_to_location"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/back_home_button"
+            android:layout_width="@dimen/button_small_width"
+            android:layout_height="@dimen/button_small_height"
+            android:layout_below="@id/proceed_to_location"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/back_home_button"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_choose_survey.xml b/app/src/main/res/layout/fragment_choose_survey.xml
new file mode 100644
index 0000000..a900604
--- /dev/null
+++ b/app/src/main/res/layout/fragment_choose_survey.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_searching_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="20dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="36dp"
+            android:fontFamily="sans-serif"
+            android:gravity="center_horizontal"
+            android:text="@string/heading_public_amenities"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/heading"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="44dp"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_horizontal"
+            android:text="@string/choose_survey"
+            android:textColor="#333333"
+            android:textSize="16sp"
+            android:textStyle="normal" />
+
+        <RelativeLayout
+            android:id="@+id/toilets"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/description"
+            android:layout_centerInParent="true"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <TextView
+                android:id="@+id/toilet_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:fontFamily="sans-serif"
+                android:text="Toilets"
+                android:textColor="#333333"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/take_survey_toilets_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginVertical="20dp"
+                android:layout_toLeftOf="@id/toilet_text"
+                android:background="@drawable/rounded_button_yellow"
+                android:fontFamily="sans-serif"
+                android:text="@string/take_survey"
+                android:textAllCaps="false"
+                android:textColor="#333333"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/seating"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/toilets"
+            android:layout_centerInParent="true"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
+
+            <TextView
+                android:id="@+id/seating_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:fontFamily="sans-serif"
+                android:text="Seating"
+                android:textColor="#333333"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/take_survey_seating_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginVertical="20dp"
+                android:layout_toLeftOf="@id/seating_text"
+                android:background="@drawable/rounded_button_yellow"
+                android:fontFamily="sans-serif"
+                android:text="@string/take_survey"
+                android:textAllCaps="false"
+                android:textColor="#333333"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+        </RelativeLayout>
+
+
+        <Button
+            android:id="@+id/back_home_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/seating"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/back_home_button"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_luminosity.xml b/app/src/main/res/layout/fragment_luminosity.xml
new file mode 100644
index 0000000..54cc8b5
--- /dev/null
+++ b/app/src/main/res/layout/fragment_luminosity.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_searching_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="20dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="36dp"
+            android:fontFamily="sans-serif"
+            android:gravity="center_horizontal"
+            android:text="@string/heading"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/heading"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="44dp"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_horizontal"
+            android:text="A quick description about the survey"
+            android:textColor="#333333"
+            android:textSize="16sp"
+            android:textStyle="normal" />
+
+
+        <Button
+            android:id="@+id/open_camera_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/description"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/open_camera_button"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/back_home_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/open_camera_button"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/back_home_button"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_luminosity_progress.xml b/app/src/main/res/layout/fragment_luminosity_progress.xml
new file mode 100644
index 0000000..c7c6da6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_luminosity_progress.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_searching_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="20dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="36dp"
+            android:fontFamily="sans-serif"
+            android:gravity="center_horizontal"
+            android:text="@string/heading"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/sub_heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/heading"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="44dp"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_horizontal"
+            android:text="Survey in Progress"
+            android:textColor="#b08902"
+            android:textSize="16sp"
+            android:textStyle="normal" />
+
+        <RelativeLayout
+            android:id="@+id/card"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/sub_heading"
+            android:layout_centerVertical="true"
+            android:gravity="center_horizontal">
+
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_margin="@dimen/activity_horizontal_margin"
+                android:contentDescription="TODO" />
+
+            <TextView
+                android:id="@+id/thumbnail_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/activity_horizontal_margin"
+                android:layout_toRightOf="@id/thumbnail"
+                android:fontFamily="sans-serif-medium"
+                android:text=" Lumens"
+                android:textColor="#333333"
+                android:textSize="16sp"
+                android:textStyle="normal" />
+
+            <Button
+                android:id="@+id/delete_photo_button"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_margin="@dimen/activity_horizontal_margin"
+                android:background="@drawable/rounded_button_yellow"
+                android:fontFamily="sans-serif-black"
+                android:text="-"
+                android:textColor="#333333"
+                android:textSize="14sp"
+                android:textStyle="normal" />
+
+        </RelativeLayout>
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/comments"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/card"
+            android:layout_margin="@dimen/activity_vertical_margin"
+            android:background="@color/grey"
+            android:hint="Comments (optional)"
+            android:padding="8dp" />
+
+        <Button
+            android:id="@+id/take_another_photo_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/comments"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="Take another photo"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/submit_luminosity"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/take_another_photo_button"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="Submit"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_progress_public_amenities.xml b/app/src/main/res/layout/fragment_progress_public_amenities.xml
new file mode 100644
index 0000000..0c41a8c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_progress_public_amenities.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_searching_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="20dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="36dp"
+            android:fontFamily="sans-serif"
+            android:gravity="center_horizontal"
+            android:text="@string/heading_public_amenities"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/heading"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="44dp"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_horizontal"
+            android:text="@string/quick_description"
+            android:textColor="#333333"
+            android:textSize="16sp"
+            android:textStyle="normal" />
+
+        <com.google.android.gms.maps.MapView
+            android:id="@+id/map_view"
+            android:layout_width="160dp"
+            android:layout_height="120dp"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@id/description"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/location_text"
+            android:layout_below="@id/map_view"
+            android:layout_margin="36dp"/>
+
+        <Button
+            android:id="@+id/confirm_location_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/location_text"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/confirm_location"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_survey_category.xml b/app/src/main/res/layout/fragment_survey_category.xml
index 18401ab..43839e9 100644
--- a/app/src/main/res/layout/fragment_survey_category.xml
+++ b/app/src/main/res/layout/fragment_survey_category.xml
@@ -8,6 +8,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <TextView
             android:id="@+id/select_category"
             android:layout_width="match_parent"
@@ -24,14 +25,14 @@
         <Button
             android:id="@+id/walkability"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/button_height"
+            android:layout_height="100dp"
             android:layout_below="@id/select_category"
             android:layout_marginVertical="20dp"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:background="@drawable/rounded_button_yellow"
             android:fontFamily="sans-serif"
-            android:text="@string/walkability"
+            android:text="@string/foothpath_condition"
             android:textAllCaps="false"
             android:textColor="#333333"
             android:textSize="18sp"
@@ -39,14 +40,14 @@
         <Button
             android:id="@+id/visibility"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/button_height"
+            android:layout_height="100dp"
             android:layout_below="@id/walkability"
             android:layout_marginVertical="20dp"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:background="@drawable/rounded_button_yellow"
             android:fontFamily="sans-serif"
-            android:text="@string/visibility"
+            android:text="@string/road_lighting_condition"
             android:textAllCaps="false"
             android:textColor="#333333"
             android:textSize="18sp"
@@ -54,17 +55,33 @@
         <Button
             android:id="@+id/drivability"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/button_height"
+            android:layout_height="100dp"
             android:layout_below="@id/visibility"
             android:layout_marginVertical="20dp"
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:background="@drawable/rounded_button_yellow"
             android:fontFamily="sans-serif"
-            android:text="@string/drivability"
+            android:text="@string/public_amenities"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/back_home_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/drivability"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/back_home_button"
             android:textAllCaps="false"
             android:textColor="#333333"
             android:textSize="18sp"
             android:textStyle="bold" />
+
     </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_survey_questions.xml b/app/src/main/res/layout/fragment_survey_questions.xml
new file mode 100644
index 0000000..7774094
--- /dev/null
+++ b/app/src/main/res/layout/fragment_survey_questions.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_searching_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="20dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="36dp"
+            android:fontFamily="sans-serif"
+            android:gravity="center_horizontal"
+            android:text="Survey Questions"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scrollbars="vertical"
+            android:id="@+id/survey_questions_recycler_view"
+            android:layout_below="@id/heading"
+            android:layout_margin="24dp"/>
+
+        <Button
+            android:id="@+id/end_survey_button"
+            android:layout_width="@dimen/button_width"
+            android:layout_height="@dimen/button_height"
+            android:layout_below="@id/survey_questions_recycler_view"
+            android:layout_centerHorizontal="true"
+            android:layout_marginVertical="20dp"
+            android:background="@drawable/rounded_button_yellow"
+            android:fontFamily="sans-serif"
+            android:text="@string/end_survey"
+            android:textAllCaps="false"
+            android:textColor="#333333"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/recycler_view_item.xml b/app/src/main/res/layout/recycler_view_item.xml
new file mode 100644
index 0000000..3e84f47
--- /dev/null
+++ b/app/src/main/res/layout/recycler_view_item.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        tools:ignore="MissingConstraints">
+
+        <RelativeLayout
+            android:id="@+id/card"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/sub_heading"
+            android:gravity="center_horizontal">
+
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="TODO"
+                android:layout_centerVertical="true"/>
+
+            <TextView
+                android:id="@+id/thumbnail_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="44dp"
+                android:fontFamily="sans-serif-medium"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:text="Lumens"
+                android:textColor="#333333"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                android:layout_toRightOf="@id/thumbnail"/>
+
+        </RelativeLayout>
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/survey_question_row_item.xml b/app/src/main/res/layout/survey_question_row_item.xml
new file mode 100644
index 0000000..a8f9674
--- /dev/null
+++ b/app/src/main/res/layout/survey_question_row_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="MissingConstraints">
+
+        <RelativeLayout
+            android:id="@+id/survey_question_item"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+
+            <TextView
+                android:id="@+id/question"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="20dp"
+                android:layout_marginBottom="44dp"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="#333333"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                tools:text="Are the toilets clean?"/>
+
+
+
+        </RelativeLayout>
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a09092..ce49ec3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,9 +40,15 @@
     <string name="qualityscore">Quality Score</string>
     <string name="viewallsurveys">View all surveys</string>
 
-     <string name="walkability">Walkability</string>
+    <string name="walkability">Walkability</string>
     <string name="visibility">Visibility</string>
     <string name="drivability">Drivability</string>
+    <string name="foothpath_condition">Footpath Condition \n Restricted Timings (6AM - 6PM)</string>
+    <string name="road_lighting_condition">Road Lighting Condition \n Restricted Timings (7PM - 5AM)</string>
+    <string name="public_amenities">Public Amenities \n Specific to locations</string>
+    <string name="restricted_timings_1">Restricted Timings (6AM - 6PM)</string>
+    <string name="restricted_timings_2">Restricted Timings (7PM - 5AM)</string>
+    <string name="location_specific">Specific to locations</string>
     <string name="select_subcategory">Please select a subcategory</string>
     <string name="select_category">Please select a category</string>
     <string name="alert_message">Your response has been submitted. Thank you for your time!</string>
@@ -56,4 +62,14 @@
     <string name="text_speedbreakers">Speed Breakers</string>
     <!-- Visibility -->
     <string name="text_luminosity">Luminosity</string>
+    <string name="heading">Road Lighting Condition Survey</string>
+    <string name="open_camera_button">Open Camera</string>
+    <string name="back_home_button">Back Home</string>
+
+    <string name="heading_public_amenities">Public Amenities Survey</string>
+    <string name="proceed_to_location">Proceed to Location</string>
+    <string name="quick_description">A quick description about the survey</string>
+    <string name="confirm_location">Confirm Location</string>
+    <string name="choose_survey">Choose the survey you wish to take</string>
+    <string name="end_survey">End Survey</string>
 </resources>
diff --git a/janaagraha/pom.xml b/janaagraha/pom.xml
deleted file mode 100644
index d014703..0000000
--- a/janaagraha/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-    <groupId>com.example</groupId>
-    <artifactId>janaagraha</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-    <name>janaagraha</name>
-    <description>Demo project for NGO Janaagraha</description>
-
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.jsonschema2pojo</groupId>
-                <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-                <version>0.4.8</version>
-                <executions>
-                    <execution>
-                        <id>generate</id>
-                        <configuration>
-                            <useCommonsLang3>true</useCommonsLang3>
-                            <includeJsr303Annotations>true</includeJsr303Annotations>
-                            <propertyWordDelimiters>_</propertyWordDelimiters>
-                            <removeOldOutput>true</removeOldOutput>
-                            <sourcePaths>
-                                <sourcePath>${basedir}/src/main/resources/schema</sourcePath>
-                            </sourcePaths>
-                            <targetPackage>com.janaagraha.model.gen</targetPackage>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/janaagraha/src/main/java/com/janaagraha/JanaagrahaApplication.java b/janaagraha/src/main/java/com/janaagraha/JanaagrahaApplication.java
deleted file mode 100644
index efd1b6a..0000000
--- a/janaagraha/src/main/java/com/janaagraha/JanaagrahaApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.janaagraha;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class JanaagrahaApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(JanaagrahaApplication.class, args);
-	}
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/ServletInitializer.java b/janaagraha/src/main/java/com/janaagraha/ServletInitializer.java
deleted file mode 100644
index 9d17e8a..0000000
--- a/janaagraha/src/main/java/com/janaagraha/ServletInitializer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.janaagraha;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-public class ServletInitializer extends SpringBootServletInitializer {
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(JanaagrahaApplication.class);
-	}
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/controller/SurveyController.java b/janaagraha/src/main/java/com/janaagraha/controller/SurveyController.java
deleted file mode 100644
index 8159849..0000000
--- a/janaagraha/src/main/java/com/janaagraha/controller/SurveyController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.janaagraha.controller;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.janaagraha.entity.Survey;
-import com.janaagraha.exception.SurveyNotFoundException;
-import com.janaagraha.repository.SurveyRepository;
-
-
-
-@RestController
-@RequestMapping("/v1")
-public class SurveyController {
-	@Autowired
-	SurveyRepository surveyRepo;
-	
-	 @GetMapping("/survey")
-	    public Iterable<Survey> findAll() {
-	        return surveyRepo.findAll();
-	    }
-
- @GetMapping("/survey/{id}")
- public Survey findOne(@PathVariable Long id) throws SurveyNotFoundException {
-	 Optional<Survey> survey = surveyRepo.findById(id);
-	 if(survey.isPresent()) {
-		 return survey.get();
-	 }
-	 else {
-		throw new SurveyNotFoundException("Survey with ID -"+id+" is not found");
-	 }
- }
- 
- @PostMapping("/survey")
- public Survey insertSurvey(@RequestBody Survey survey) {
-	 System.out.println("Inserting survey");
-	 return surveyRepo.save(survey);
- }
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/controller/UserController.java b/janaagraha/src/main/java/com/janaagraha/controller/UserController.java
deleted file mode 100644
index 8930b9f..0000000
--- a/janaagraha/src/main/java/com/janaagraha/controller/UserController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.janaagraha.controller;
-
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.janaagraha.entity.User;
-import com.janaagraha.exception.UserNotFoundException;
-import com.janaagraha.repository.UserRepository;
-
-@RestController
-@RequestMapping("/v1")
-public class UserController {
-	
-@Autowired
-UserRepository userRepo;
-	
-@GetMapping("/user/{id}")
-public User getUser(@PathVariable String id) throws UserNotFoundException {
-	Optional<User> user = userRepo.findById(id);
-	if(user.isPresent()) {
-		
-		return user.get();
-	}
-	else {
-		throw new UserNotFoundException("User Not Found with ID "+id+" Not found");
-	}
-	
-}
-@PostMapping("/user")
-public User insertUser(@RequestBody User user) {
-	return userRepo.save(user);	
-}
-
-
-
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/entity/Survey.java b/janaagraha/src/main/java/com/janaagraha/entity/Survey.java
deleted file mode 100644
index 4db929b..0000000
--- a/janaagraha/src/main/java/com/janaagraha/entity/Survey.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.janaagraha.entity;
-
-import javax.persistence.Entity;
-
-
-@Entity
-public class Survey {
-	@javax.persistence.Id
-	public long Id;
-		private String city;
-	    private String location;
-	    private Long position;
-	    private String category;
-	    private String subCategory;
-	    private String qualityScore;
-	    private String startSurveyPoint;
-	    private String endSurveyPoint;
-	    private Integer image;
-	public void setCity(String city) {
-		this.city = city;
-	}
-	public String getLocation() {
-		return location;
-	}
-	public void setLocation(String location) {
-		this.location = location;
-	}
-	public Long getPosition() {
-		return position;
-	}
-	public void setPosition(Long position) {
-		this.position = position;
-	}
-	public String getCategory() {
-		return category;
-	}
-	public void setCategory(String category) {
-		this.category = category;
-	}
-	public String getSubCategory() {
-		return subCategory;
-	}
-	public void setSubCategory(String subCategory) {
-		this.subCategory = subCategory;
-	}
-	public String getQualityScore() {
-		return qualityScore;
-	}
-	public void setQualityScore(String qualityScore) {
-		this.qualityScore = qualityScore;
-	}
-	public String getStartSurveyPoint() {
-		return startSurveyPoint;
-	}
-	public void setStartSurveyPoint(String startSurveyPoint) {
-		this.startSurveyPoint = startSurveyPoint;
-	}
-	public String getEndSurveyPoint() {
-		return endSurveyPoint;
-	}
-	public void setEndSurveyPoint(String endSurveyPoint) {
-		this.endSurveyPoint = endSurveyPoint;
-	}
-	public Integer getImage() {
-		return image;
-	}
-	 public String getCity() {
-			return city;
-		}
-		
-		public void setImage(Integer image) {
-			this.image = image;
-		}
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/entity/User.java b/janaagraha/src/main/java/com/janaagraha/entity/User.java
deleted file mode 100644
index 0449948..0000000
--- a/janaagraha/src/main/java/com/janaagraha/entity/User.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.janaagraha.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class User {
-
-	@Id
-	public String id;
-    private boolean isVerified;
-    private String name;
-    private String email;
-    private String phone;
-    private Integer image;
-    private double rating;
-    private String liveLocation;
-    private String timeStamp;
-
-    
-    public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public boolean isVerified() {
-		return isVerified;
-	}
-	public void setVerified(boolean isVerified) {
-		this.isVerified = isVerified;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getEmail() {
-		return email;
-	}
-	public void setEmail(String email) {
-		this.email = email;
-	}
-	public String getPhone() {
-		return phone;
-	}
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-	public Integer getImage() {
-		return image;
-	}
-	public void setImage(Integer image) {
-		this.image = image;
-	}
-	public double getRating() {
-		return rating;
-	}
-	public void setRating(double rating) {
-		this.rating = rating;
-	}
-	public String getLiveLocation() {
-		return liveLocation;
-	}
-	public void setLiveLocation(String liveLocation) {
-		this.liveLocation = liveLocation;
-	}
-	public String getTimeStamp() {
-		return timeStamp;
-	}
-	public void setTimeStamp(String timeStamp) {
-		this.timeStamp = timeStamp;
-	}
-	
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/entity/enums/Category.java b/janaagraha/src/main/java/com/janaagraha/entity/enums/Category.java
deleted file mode 100644
index bd6ada4..0000000
--- a/janaagraha/src/main/java/com/janaagraha/entity/enums/Category.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.janaagraha.entity.enums;
-
-public enum Category {
-	WALKABILITY,
-	VISISBILITY,
-	DRIVABILITY
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/exception/SurveyNotFoundException.java b/janaagraha/src/main/java/com/janaagraha/exception/SurveyNotFoundException.java
deleted file mode 100644
index 4990d46..0000000
--- a/janaagraha/src/main/java/com/janaagraha/exception/SurveyNotFoundException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.janaagraha.exception;
-
-
-public class SurveyNotFoundException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	public SurveyNotFoundException(String message) {
-		super(message);
-	}
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/exception/UserNotFoundException.java b/janaagraha/src/main/java/com/janaagraha/exception/UserNotFoundException.java
deleted file mode 100644
index 545e31a..0000000
--- a/janaagraha/src/main/java/com/janaagraha/exception/UserNotFoundException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.janaagraha.exception;
-
-public class UserNotFoundException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	public String message;
-	public UserNotFoundException(String message) {
-		super(message);
-	}
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/repository/SurveyRepository.java b/janaagraha/src/main/java/com/janaagraha/repository/SurveyRepository.java
deleted file mode 100644
index 21281c9..0000000
--- a/janaagraha/src/main/java/com/janaagraha/repository/SurveyRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.janaagraha.repository;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-import com.janaagraha.entity.Survey;
-@Repository
-public interface SurveyRepository extends CrudRepository<Survey, Long> {
-
-}
diff --git a/janaagraha/src/main/java/com/janaagraha/repository/UserRepository.java b/janaagraha/src/main/java/com/janaagraha/repository/UserRepository.java
deleted file mode 100644
index ec301f4..0000000
--- a/janaagraha/src/main/java/com/janaagraha/repository/UserRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.janaagraha.repository;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-import com.janaagraha.entity.User;
-
-@Repository
-public interface UserRepository extends CrudRepository<User,String> {
-
-}
diff --git a/janaagraha/src/main/resources/application.properties b/janaagraha/src/main/resources/application.properties
deleted file mode 100644
index 4002474..0000000
--- a/janaagraha/src/main/resources/application.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-spring.datasource.url=jdbc:h2:mem:testdb
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=password
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.h2.console.enabled=true
-server.port = 9086
diff --git a/janaagraha/src/main/resources/schema/category.json b/janaagraha/src/main/resources/schema/category.json
deleted file mode 100644
index 2424a13..0000000
--- a/janaagraha/src/main/resources/schema/category.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "definitions": {},
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
-  "type": "object",
-  "title": "Category",
-  "required": [
-    "id",
-    "categoryName",
-    "categoryDistance",
-    "subCategories",
-     "location",
-     "latLong"
-  ],
-  "properties": {
-    "id": {
-      "$id": "#/properties/id",
-      "type": "string",
-      "title": "Id of the category",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-    "categoryName": {
-      "$id": "#/properties/categoryName",
-      "type": "string",
-      "title": "Name of the Survey - Optional",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-     "categoryDistance": {
-      "$id": "#/properties/categoryDistance",
-      "type": "integer",
-      "title": "Distance calculated in the Category"
-    },
-    "subCategories": {
-      "type": "array",
-      "items": {
-        "$ref": "./subcategory.json"
-      }
-
-    }
-  }
-}
\ No newline at end of file
diff --git a/janaagraha/src/main/resources/schema/subcategory.json b/janaagraha/src/main/resources/schema/subcategory.json
deleted file mode 100644
index 021a3ac..0000000
--- a/janaagraha/src/main/resources/schema/subcategory.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "definitions": {},
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
-  "type": "object",
-  "title": "Category",
-  "required": [
-    "id",
-    "subCategoryName",
-    "subCategoryDistance",
-    "location",
-    "comments",
-    "latLong",
-    "image"
-  ],
-  "properties": {
-    "id": {
-      "$id": "#/properties/id",
-      "type": "string",
-      "title": "Id of the Sub category",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-     "subCategoryName": {
-      "$id": "#/properties/subCategoryName",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,128})$",
-      "title": "Sub Category Name"
-    },
-    "subCategoryDistance": {
-      "$id": "#/properties/subCategoryDistance",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Distance Calculated for SubCategory"
-    },
-    "comments": {
-      "$id": "#/properties/comments",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Comments for each subcategory"
-
-    },
-    "latLong": {
-      "$id": "#/properties/latLong",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Lat Long for each subcategory"
-    },
-    "image": {
-      "$id": "#/properties/image",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Image for each subcategory"
-    }
-  }
-}
\ No newline at end of file
diff --git a/janaagraha/src/main/resources/schema/survey.json b/janaagraha/src/main/resources/schema/survey.json
deleted file mode 100644
index c2ccb38..0000000
--- a/janaagraha/src/main/resources/schema/survey.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "definitions": {},
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
-  "type": "object",
-  "title": "Survey",
-  "required": [
-    "id",
-    "surveyName",
-    "category"
-  ],
-  "properties": {
-    "id": {
-      "$id": "#/properties/id",
-      "type": "string",
-      "title": "Id of the survey",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-    "surveyName": {
-      "$id": "#/properties/surveyName",
-      "type": "string",
-      "title": "Name of the Survey - Optional",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-    "category": {
-      "$ref": "./category.json"
-    }
-  }
-}
\ No newline at end of file
diff --git a/janaagraha/target/classes/application.properties b/janaagraha/target/classes/application.properties
deleted file mode 100644
index 4002474..0000000
--- a/janaagraha/target/classes/application.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-spring.datasource.url=jdbc:h2:mem:testdb
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=password
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.h2.console.enabled=true
-server.port = 9086
diff --git a/janaagraha/target/classes/schema/category.json b/janaagraha/target/classes/schema/category.json
deleted file mode 100644
index 2424a13..0000000
--- a/janaagraha/target/classes/schema/category.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "definitions": {},
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
-  "type": "object",
-  "title": "Category",
-  "required": [
-    "id",
-    "categoryName",
-    "categoryDistance",
-    "subCategories",
-     "location",
-     "latLong"
-  ],
-  "properties": {
-    "id": {
-      "$id": "#/properties/id",
-      "type": "string",
-      "title": "Id of the category",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-    "categoryName": {
-      "$id": "#/properties/categoryName",
-      "type": "string",
-      "title": "Name of the Survey - Optional",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-     "categoryDistance": {
-      "$id": "#/properties/categoryDistance",
-      "type": "integer",
-      "title": "Distance calculated in the Category"
-    },
-    "subCategories": {
-      "type": "array",
-      "items": {
-        "$ref": "./subcategory.json"
-      }
-
-    }
-  }
-}
\ No newline at end of file
diff --git a/janaagraha/target/classes/schema/subcategory.json b/janaagraha/target/classes/schema/subcategory.json
deleted file mode 100644
index 021a3ac..0000000
--- a/janaagraha/target/classes/schema/subcategory.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "definitions": {},
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
-  "type": "object",
-  "title": "Category",
-  "required": [
-    "id",
-    "subCategoryName",
-    "subCategoryDistance",
-    "location",
-    "comments",
-    "latLong",
-    "image"
-  ],
-  "properties": {
-    "id": {
-      "$id": "#/properties/id",
-      "type": "string",
-      "title": "Id of the Sub category",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-     "subCategoryName": {
-      "$id": "#/properties/subCategoryName",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,128})$",
-      "title": "Sub Category Name"
-    },
-    "subCategoryDistance": {
-      "$id": "#/properties/subCategoryDistance",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Distance Calculated for SubCategory"
-    },
-    "comments": {
-      "$id": "#/properties/comments",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Comments for each subcategory"
-
-    },
-    "latLong": {
-      "$id": "#/properties/latLong",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Lat Long for each subcategory"
-    },
-    "image": {
-      "$id": "#/properties/image",
-      "type": "string",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$",
-      "title": "Image for each subcategory"
-    }
-  }
-}
\ No newline at end of file
diff --git a/janaagraha/target/classes/schema/survey.json b/janaagraha/target/classes/schema/survey.json
deleted file mode 100644
index c2ccb38..0000000
--- a/janaagraha/target/classes/schema/survey.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "definitions": {},
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://example.com/root.json",
-  "type": "object",
-  "title": "Survey",
-  "required": [
-    "id",
-    "surveyName",
-    "category"
-  ],
-  "properties": {
-    "id": {
-      "$id": "#/properties/id",
-      "type": "string",
-      "title": "Id of the survey",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-    "surveyName": {
-      "$id": "#/properties/surveyName",
-      "type": "string",
-      "title": "Name of the Survey - Optional",
-      "default": "",
-      "pattern": "^([A-Za-z0-9]{1,64})$"
-    },
-    "category": {
-      "$ref": "./category.json"
-    }
-  }
-}
\ No newline at end of file
diff --git a/janaagraha/target/java-gen/com/janaagraha/model/gen/Category.java b/janaagraha/target/java-gen/com/janaagraha/model/gen/Category.java
deleted file mode 100644
index c6b7b14..0000000
--- a/janaagraha/target/java-gen/com/janaagraha/model/gen/Category.java
+++ /dev/null
@@ -1,200 +0,0 @@
-
-package com.janaagraha.model.gen;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-
-/**
- * Category
- * <p>
- * 
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@Generated("org.jsonschema2pojo")
-@JsonPropertyOrder({
-    "id",
-    "categoryName",
-    "categoryDistance",
-    "subCategories"
-})
-public class Category {
-
-    /**
-     * Id of the category
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("id")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String id;
-    /**
-     * Name of the Survey - Optional
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("categoryName")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String categoryName;
-    /**
-     * Distance calculated in the Category
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("categoryDistance")
-    private Integer categoryDistance;
-    @JsonProperty("subCategories")
-    @Valid
-    private List<SubCategory> subCategories = new ArrayList<SubCategory>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    /**
-     * Id of the category
-     * <p>
-     * 
-     * 
-     * @return
-     *     The id
-     */
-    @JsonProperty("id")
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Id of the category
-     * <p>
-     * 
-     * 
-     * @param id
-     *     The id
-     */
-    @JsonProperty("id")
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * Name of the Survey - Optional
-     * <p>
-     * 
-     * 
-     * @return
-     *     The categoryName
-     */
-    @JsonProperty("categoryName")
-    public String getCategoryName() {
-        return categoryName;
-    }
-
-    /**
-     * Name of the Survey - Optional
-     * <p>
-     * 
-     * 
-     * @param categoryName
-     *     The categoryName
-     */
-    @JsonProperty("categoryName")
-    public void setCategoryName(String categoryName) {
-        this.categoryName = categoryName;
-    }
-
-    /**
-     * Distance calculated in the Category
-     * <p>
-     * 
-     * 
-     * @return
-     *     The categoryDistance
-     */
-    @JsonProperty("categoryDistance")
-    public Integer getCategoryDistance() {
-        return categoryDistance;
-    }
-
-    /**
-     * Distance calculated in the Category
-     * <p>
-     * 
-     * 
-     * @param categoryDistance
-     *     The categoryDistance
-     */
-    @JsonProperty("categoryDistance")
-    public void setCategoryDistance(Integer categoryDistance) {
-        this.categoryDistance = categoryDistance;
-    }
-
-    /**
-     * 
-     * @return
-     *     The subCategories
-     */
-    @JsonProperty("subCategories")
-    public List<SubCategory> getSubCategories() {
-        return subCategories;
-    }
-
-    /**
-     * 
-     * @param subCategories
-     *     The subCategories
-     */
-    @JsonProperty("subCategories")
-    public void setSubCategories(List<SubCategory> subCategories) {
-        this.subCategories = subCategories;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(id).append(categoryName).append(categoryDistance).append(subCategories).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof Category) == false) {
-            return false;
-        }
-        Category rhs = ((Category) other);
-        return new EqualsBuilder().append(id, rhs.id).append(categoryName, rhs.categoryName).append(categoryDistance, rhs.categoryDistance).append(subCategories, rhs.subCategories).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/janaagraha/target/java-gen/com/janaagraha/model/gen/SubCategory.java b/janaagraha/target/java-gen/com/janaagraha/model/gen/SubCategory.java
deleted file mode 100644
index 56de421..0000000
--- a/janaagraha/target/java-gen/com/janaagraha/model/gen/SubCategory.java
+++ /dev/null
@@ -1,282 +0,0 @@
-
-package com.janaagraha.model.gen;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import javax.validation.constraints.Pattern;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-
-/**
- * Category
- * <p>
- * 
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@Generated("org.jsonschema2pojo")
-@JsonPropertyOrder({
-    "id",
-    "subCategoryName",
-    "subCategoryDistance",
-    "comments",
-    "latLong",
-    "image"
-})
-public class SubCategory {
-
-    /**
-     * Id of the Sub category
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("id")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String id;
-    /**
-     * Sub Category Name
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("subCategoryName")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,128})$")
-    private String subCategoryName;
-    /**
-     * Distance Calculated for SubCategory
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("subCategoryDistance")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String subCategoryDistance;
-    /**
-     * Comments for each subcategory
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("comments")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String comments;
-    /**
-     * Lat Long for each subcategory
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("latLong")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String latLong;
-    /**
-     * Image for each subcategory
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("image")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String image;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    /**
-     * Id of the Sub category
-     * <p>
-     * 
-     * 
-     * @return
-     *     The id
-     */
-    @JsonProperty("id")
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Id of the Sub category
-     * <p>
-     * 
-     * 
-     * @param id
-     *     The id
-     */
-    @JsonProperty("id")
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * Sub Category Name
-     * <p>
-     * 
-     * 
-     * @return
-     *     The subCategoryName
-     */
-    @JsonProperty("subCategoryName")
-    public String getSubCategoryName() {
-        return subCategoryName;
-    }
-
-    /**
-     * Sub Category Name
-     * <p>
-     * 
-     * 
-     * @param subCategoryName
-     *     The subCategoryName
-     */
-    @JsonProperty("subCategoryName")
-    public void setSubCategoryName(String subCategoryName) {
-        this.subCategoryName = subCategoryName;
-    }
-
-    /**
-     * Distance Calculated for SubCategory
-     * <p>
-     * 
-     * 
-     * @return
-     *     The subCategoryDistance
-     */
-    @JsonProperty("subCategoryDistance")
-    public String getSubCategoryDistance() {
-        return subCategoryDistance;
-    }
-
-    /**
-     * Distance Calculated for SubCategory
-     * <p>
-     * 
-     * 
-     * @param subCategoryDistance
-     *     The subCategoryDistance
-     */
-    @JsonProperty("subCategoryDistance")
-    public void setSubCategoryDistance(String subCategoryDistance) {
-        this.subCategoryDistance = subCategoryDistance;
-    }
-
-    /**
-     * Comments for each subcategory
-     * <p>
-     * 
-     * 
-     * @return
-     *     The comments
-     */
-    @JsonProperty("comments")
-    public String getComments() {
-        return comments;
-    }
-
-    /**
-     * Comments for each subcategory
-     * <p>
-     * 
-     * 
-     * @param comments
-     *     The comments
-     */
-    @JsonProperty("comments")
-    public void setComments(String comments) {
-        this.comments = comments;
-    }
-
-    /**
-     * Lat Long for each subcategory
-     * <p>
-     * 
-     * 
-     * @return
-     *     The latLong
-     */
-    @JsonProperty("latLong")
-    public String getLatLong() {
-        return latLong;
-    }
-
-    /**
-     * Lat Long for each subcategory
-     * <p>
-     * 
-     * 
-     * @param latLong
-     *     The latLong
-     */
-    @JsonProperty("latLong")
-    public void setLatLong(String latLong) {
-        this.latLong = latLong;
-    }
-
-    /**
-     * Image for each subcategory
-     * <p>
-     * 
-     * 
-     * @return
-     *     The image
-     */
-    @JsonProperty("image")
-    public String getImage() {
-        return image;
-    }
-
-    /**
-     * Image for each subcategory
-     * <p>
-     * 
-     * 
-     * @param image
-     *     The image
-     */
-    @JsonProperty("image")
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(id).append(subCategoryName).append(subCategoryDistance).append(comments).append(latLong).append(image).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof SubCategory) == false) {
-            return false;
-        }
-        SubCategory rhs = ((SubCategory) other);
-        return new EqualsBuilder().append(id, rhs.id).append(subCategoryName, rhs.subCategoryName).append(subCategoryDistance, rhs.subCategoryDistance).append(comments, rhs.comments).append(latLong, rhs.latLong).append(image, rhs.image).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/janaagraha/target/java-gen/com/janaagraha/model/gen/Survey.java b/janaagraha/target/java-gen/com/janaagraha/model/gen/Survey.java
deleted file mode 100644
index f55e729..0000000
--- a/janaagraha/target/java-gen/com/janaagraha/model/gen/Survey.java
+++ /dev/null
@@ -1,175 +0,0 @@
-
-package com.janaagraha.model.gen;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-
-/**
- * Survey
- * <p>
- * 
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@Generated("org.jsonschema2pojo")
-@JsonPropertyOrder({
-    "id",
-    "surveyName",
-    "category"
-})
-public class Survey {
-
-    /**
-     * Id of the survey
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("id")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String id;
-    /**
-     * Name of the Survey - Optional
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("surveyName")
-    @Pattern(regexp = "^([A-Za-z0-9]{1,64})$")
-    private String surveyName;
-    /**
-     * Category
-     * <p>
-     * 
-     * 
-     */
-    @JsonProperty("category")
-    @Valid
-    private Category category;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    /**
-     * Id of the survey
-     * <p>
-     * 
-     * 
-     * @return
-     *     The id
-     */
-    @JsonProperty("id")
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Id of the survey
-     * <p>
-     * 
-     * 
-     * @param id
-     *     The id
-     */
-    @JsonProperty("id")
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * Name of the Survey - Optional
-     * <p>
-     * 
-     * 
-     * @return
-     *     The surveyName
-     */
-    @JsonProperty("surveyName")
-    public String getSurveyName() {
-        return surveyName;
-    }
-
-    /**
-     * Name of the Survey - Optional
-     * <p>
-     * 
-     * 
-     * @param surveyName
-     *     The surveyName
-     */
-    @JsonProperty("surveyName")
-    public void setSurveyName(String surveyName) {
-        this.surveyName = surveyName;
-    }
-
-    /**
-     * Category
-     * <p>
-     * 
-     * 
-     * @return
-     *     The category
-     */
-    @JsonProperty("category")
-    public Category getCategory() {
-        return category;
-    }
-
-    /**
-     * Category
-     * <p>
-     * 
-     * 
-     * @param category
-     *     The category
-     */
-    @JsonProperty("category")
-    public void setCategory(Category category) {
-        this.category = category;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(id).append(surveyName).append(category).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof Survey) == false) {
-            return false;
-        }
-        Survey rhs = ((Survey) other);
-        return new EqualsBuilder().append(id, rhs.id).append(surveyName, rhs.surveyName).append(category, rhs.category).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}