diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
index 6ff2bfa6b..bd10fd433 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -20,11 +20,16 @@
 package org.isoron.uhabits.activities.habits.edit;
 
 import android.content.*;
+import android.content.res.Resources;
 import android.os.*;
 import android.support.annotation.*;
 import android.support.v7.app.*;
 import android.text.format.*;
+import android.util.Log;
 import android.view.*;
+import android.widget.AdapterView;
+import android.widget.Spinner;
+import android.widget.TextView;
 
 import com.android.datetimepicker.time.*;
 
@@ -180,7 +185,13 @@ public class EditHabitDialog extends AppCompatDialogFragment
         habit.setFrequency(frequencyPanel.getFrequency());
         habit.setUnit(targetPanel.getUnit());
         habit.setTargetValue(targetPanel.getTargetValue());
-        habit.setType(type);
+//        habit.setType(type); //removing
+// adding below lines
+        Log.d("habit-typeNum",String.valueOf(habit.getType()));
+        if (targetPanel.getVisibility() == View.VISIBLE)
+            habit.setType(Habit.NUMBER_HABIT);
+        else
+            habit.setType(Habit.YES_NO_HABIT);
 
         saveHabit(habit);
         dismiss();
@@ -201,14 +212,74 @@ public class EditHabitDialog extends AppCompatDialogFragment
         return habit;
     }
 
+    @BindView(R.id.spHabitType)
+    Spinner spHabitType;
+
+    @BindView(R.id.tvSpinnerHabitType)
+    TextView tvSpinnerHabitType;
+
+    @BindView(R.id.tvDescription)
+    ExampleEditText tvDescription;
+
+    private void setupHabitTypeController(Habit habit){
+
+        spHabitType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+
+                Log.d("spinner-position", String.valueOf(i));
+                Resources res = getResources();
+
+                if (i == Habit.NUMBER_HABIT){
+                    habit.setType(Habit.NUMBER_HABIT);
+                }else {
+                    habit.setType(Habit.YES_NO_HABIT);
+                }
+
+                if(i == Habit.NUMBER_HABIT)
+                    tvDescription.setExample(res.getString(R.string.example_question_numerical));
+                else
+                    tvDescription.setExample(res.getString(R.string.example_question_boolean));
+
+                // Copied from populateform()
+                if (habit.isNumerical()) {
+                    frequencyPanel.setVisibility(GONE);
+                    targetPanel.setVisibility(View.VISIBLE);
+                }
+                else {
+                    targetPanel.setVisibility(GONE);
+                    frequencyPanel.setVisibility(View.VISIBLE);
+                }
+
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
+    }
+
     private void populateForm()
     {
         Habit habit = modelFactory.buildHabit();
         habit.setFrequency(Frequency.DAILY);
         habit.setColor(prefs.getDefaultHabitColor(habit.getColor()));
-        habit.setType(getTypeFromArguments());
+        habit.setType(getTypeFromArguments());//commenting this line for test purpose
+//        habit.setType(Habit.NUMBER_HABIT);//To be deleted later
+
+        if (originalHabit != null) {//edit habit
+
+            Log.d("isEditHabit", "true");
+            habit.copyFrom(originalHabit);
+
+            //Hide the 'type of habit' question on edit habit
+            spHabitType.setVisibility(GONE);
+            tvSpinnerHabitType.setVisibility(GONE);
+        }
 
-        if (originalHabit != null) habit.copyFrom(originalHabit);
+        //setting own habit controller
+        setupHabitTypeController(habit);
 
         if (habit.isNumerical()) frequencyPanel.setVisibility(GONE);
         else targetPanel.setVisibility(GONE);
diff --git a/uhabits-android/src/main/res/layout/edit_habit_name.xml b/uhabits-android/src/main/res/layout/edit_habit_name.xml
index 70ad45cdc..ca61ecb8a 100644
--- a/uhabits-android/src/main/res/layout/edit_habit_name.xml
+++ b/uhabits-android/src/main/res/layout/edit_habit_name.xml
@@ -54,6 +54,19 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/tvSpinnerHabitType"
+        android:textColor="@color/black_a6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Type"/>
+    <Spinner
+        android:id="@+id/spHabitType"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:entries="@array/habitType"
+        android:layout_marginBottom="10dp"/>
+
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
diff --git a/uhabits-android/src/main/res/values/constants.xml b/uhabits-android/src/main/res/values/constants.xml
index 34e8136a5..e4e7f4073 100644
--- a/uhabits-android/src/main/res/values/constants.xml
+++ b/uhabits-android/src/main/res/values/constants.xml
@@ -89,6 +89,10 @@
         <item>@string/uncheck</item>
         <item>@string/toggle</item>
     </string-array>
+    <string-array name="habitType" translatable="false">
+        <item>With a simple yes or no</item>
+        <item>With a number</item>
+    </string-array>
 
     <string-array name="strengthIntervalNames" translatable="false">
         <item>@string/day</item>
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
index e465eed3e..51d8accc0 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java
@@ -187,18 +187,36 @@ public abstract class RepetitionList
     @NonNull
     public synchronized Repetition toggle(Timestamp timestamp)
     {
-        if(habit.isNumerical())
+        Repetition rep = getByTimestamp(timestamp);
+        //Commenting below lines
+        if(habit.isNumerical()){
+//          TODO remove later
+            if (rep != null) remove(rep);
+            else
+            {
+                rep = new Repetition(timestamp, Checkmark.CHECKED_EXPLICITLY);
+                add(rep);
+            }
+
+            habit.invalidateNewerThan(timestamp);
+//          TODO remove later
+//            TODO write code to handle numerical habits
+
+/*
             throw new IllegalStateException("habit must NOT be numerical");
+            handle numeric habit here
+*/
+        }else {
 
-        Repetition rep = getByTimestamp(timestamp);
-        if (rep != null) remove(rep);
-        else
-        {
-            rep = new Repetition(timestamp, Checkmark.CHECKED_EXPLICITLY);
-            add(rep);
-        }
+            if (rep != null) remove(rep);
+            else
+            {
+                rep = new Repetition(timestamp, Checkmark.CHECKED_EXPLICITLY);
+                add(rep);
+            }
 
-        habit.invalidateNewerThan(timestamp);
+            habit.invalidateNewerThan(timestamp);
+        }
         return rep;
     }