diff --git a/build.gradle b/build.gradle
index 6692adb1e..00692e91f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
         classpath 'org.ajoberstar:grgit:1.5.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
+        classpath 'com.google.gms:google-services:3.1.1'
     }
 }
 
diff --git a/uhabits-android/build.gradle b/uhabits-android/build.gradle
index 5acaf1c1d..abd915fe5 100644
--- a/uhabits-android/build.gradle
+++ b/uhabits-android/build.gradle
@@ -16,7 +16,7 @@ android {
     compileSdkVersion COMPILE_SDK_VERSION as Integer
     buildToolsVersion BUILD_TOOLS_VERSION
 
-    if(project.hasProperty("LOOP_STORE_FILE")) {
+    if (project.hasProperty("LOOP_STORE_FILE")) {
         signingConfigs {
             release {
                 storeFile file(LOOP_STORE_FILE)
@@ -108,6 +108,9 @@ dependencies {
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$KOTLIN_VERSION"
 
+    implementation 'com.google.firebase:firebase-auth:11.6.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     compileOnly "javax.annotation:jsr250-api:1.0"
     compileOnly "com.google.auto.factory:auto-factory:1.0-beta3"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
@@ -188,3 +191,5 @@ task coverageReport(type: JacocoReport) {
 play {
     track = 'alpha'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/uhabits-android/google-services.json b/uhabits-android/google-services.json
new file mode 100644
index 000000000..f79ff9d61
--- /dev/null
+++ b/uhabits-android/google-services.json
@@ -0,0 +1,59 @@
+{
+  "project_info": {
+    "project_number": "1070387411684",
+    "firebase_url": "https://uhabits-60f5c.firebaseio.com",
+    "project_id": "uhabits-60f5c",
+    "storage_bucket": "uhabits-60f5c.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1070387411684:android:c24ac74afee79412",
+        "android_client_info": {
+          "package_name": "org.isoron.uhabits"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "1070387411684-62dgqp208udgiql8k3nk9nnsj99tps2n.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.isoron.uhabits",
+            "certificate_hash": "f7ade3b34bad8aadad38b28645d32ff5674a96a5"
+          }
+        },
+        {
+          "client_id": "1070387411684-sinls84quiqltb6t9mlok2cg1qaqu4hk.apps.googleusercontent.com",
+          "client_type": 3
+        },
+        {
+          "client_id": "1070387411684-sinls84quiqltb6t9mlok2cg1qaqu4hk.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA_FuA7_lt1HQ6yG39YDHykKa5B9Bngs6s"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "1070387411684-sinls84quiqltb6t9mlok2cg1qaqu4hk.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml
index be3dff213..d0ee59db9 100644
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
   ~
   ~ This file is part of Loop Habit Tracker.
@@ -17,16 +16,12 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
-<manifest
-    package="org.isoron.uhabits"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.VIBRATE"/>
-
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-
-    <uses-permission android:name="android.permission.INTERNET"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.isoron.uhabits">
 
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
@@ -39,24 +34,26 @@
         android:theme="@style/AppBaseTheme">
         <meta-data
             android:name="com.google.android.backup.api_key"
-            android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw"/>
+            android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw" />
 
         <activity
             android:name=".activities.habits.list.ListHabitsActivity"
             android:exported="true"
             android:label="@string/main_activity_title"
-            android:launchMode="singleTop"/>
+            android:launchMode="singleTop" />
 
         <activity-alias
             android:name=".MainActivity"
             android:label="@string/main_activity_title"
             android:launchMode="singleTop"
             android:targetActivity=".activities.habits.list.ListHabitsActivity">
+<!--
             <intent-filter android:label="@string/app_name">
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+-->
         </activity-alias>
 
         <activity
@@ -64,24 +61,24 @@
             android:label="@string/title_activity_show_habit">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.habits.list.ListHabitsActivity"/>
+                android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
         <activity
             android:name=".activities.settings.SettingsActivity"
             android:label="@string/settings">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.habits.list.ListHabitsActivity"/>
+                android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
         <activity
             android:name=".activities.intro.IntroActivity"
             android:label=""
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".widgets.HabitPickerDialog"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
         <activity
@@ -89,101 +86,101 @@
             android:label="@string/about">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.habits.list.ListHabitsActivity"/>
+                android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
-        <activity android:name=".notifications.SnoozeDelayPickerActivity"
+        <activity
+            android:name=".notifications.SnoozeDelayPickerActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
-        </activity>
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
 
         <receiver
             android:name=".widgets.CheckmarkWidgetProvider"
             android:label="@string/checkmark">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_checkmark_info"/>
+                android:resource="@xml/widget_checkmark_info" />
         </receiver>
         <receiver
             android:name=".widgets.HistoryWidgetProvider"
             android:label="@string/history">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_history_info"/>
+                android:resource="@xml/widget_history_info" />
         </receiver>
         <receiver
             android:name=".widgets.ScoreWidgetProvider"
             android:label="@string/habit_strength">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_score_info"/>
+                android:resource="@xml/widget_score_info" />
         </receiver>
         <receiver
             android:name=".widgets.StreakWidgetProvider"
             android:label="@string/streaks">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_streak_info"/>
+                android:resource="@xml/widget_streak_info" />
         </receiver>
         <receiver
             android:name=".widgets.FrequencyWidgetProvider"
             android:label="@string/frequency">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_frequency_info"/>
+                android:resource="@xml/widget_frequency_info" />
         </receiver>
         <receiver android:name=".receivers.ReminderReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.WidgetReceiver">
             <intent-filter>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
 
-                <action android:name="org.isoron.uhabits.ACTION_TOGGLE_REPETITION"/>
+                <action android:name="org.isoron.uhabits.ACTION_TOGGLE_REPETITION" />
 
                 <data
                     android:host="org.isoron.uhabits"
-                    android:scheme="content"/>
+                    android:scheme="content" />
             </intent-filter>
             <intent-filter>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
 
-                <action android:name="org.isoron.uhabits.ACTION_ADD_REPETITION"/>
+                <action android:name="org.isoron.uhabits.ACTION_ADD_REPETITION" />
 
                 <data
                     android:host="org.isoron.uhabits"
-                    android:scheme="content"/>
+                    android:scheme="content" />
             </intent-filter>
             <intent-filter>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
 
-                <action android:name="org.isoron.uhabits.ACTION_REMOVE_REPETITION"/>
+                <action android:name="org.isoron.uhabits.ACTION_REMOVE_REPETITION" />
 
                 <data
                     android:host="org.isoron.uhabits"
-                    android:scheme="content"/>
+                    android:scheme="content" />
             </intent-filter>
         </receiver>
 
@@ -194,7 +191,7 @@
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING"/>
+                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>
         </activity>
 
@@ -203,7 +200,7 @@
             android:name=".automation.FireSettingReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
+                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>
         </receiver>
 
@@ -214,14 +211,21 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"/>
+                android:resource="@xml/file_paths" />
         </provider>
 
         <service
             android:name=".sync.SyncService"
             android:enabled="true"
-            android:exported="false">
-        </service>
+            android:exported="false"></service>
+
+        <activity android:name=".activities.login.LoginActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
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/java/org/isoron/uhabits/activities/login/LoginActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/login/LoginActivity.java
new file mode 100644
index 000000000..755cde1f5
--- /dev/null
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/login/LoginActivity.java
@@ -0,0 +1,46 @@
+package org.isoron.uhabits.activities.login;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.firebase.ui.auth.AuthUI;
+
+import org.isoron.uhabits.R;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class LoginActivity extends AppCompatActivity {
+
+    private static final int RC_SIGN_IN = 123;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+
+        signin();
+    }
+
+    private void signin() {
+// ...
+
+// Choose authentication providers
+        List<AuthUI.IdpConfig> providers = Arrays.asList(
+                new AuthUI.IdpConfig.EmailBuilder().build(),
+                new AuthUI.IdpConfig.PhoneBuilder().build(),
+                new AuthUI.IdpConfig.GoogleBuilder().build(),
+                new AuthUI.IdpConfig.FacebookBuilder().build(),
+                new AuthUI.IdpConfig.TwitterBuilder().build());
+
+// Create and launch sign-in intent
+        startActivityForResult(
+                AuthUI.getInstance()
+                        .createSignInIntentBuilder()
+                        .setAvailableProviders(providers)
+                        .build(),
+                RC_SIGN_IN);
+    }
+
+
+}
diff --git a/uhabits-android/src/main/res/layout/activity_login.xml b/uhabits-android/src/main/res/layout/activity_login.xml
new file mode 100644
index 000000000..3566532a1
--- /dev/null
+++ b/uhabits-android/src/main/res/layout/activity_login.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.login.LoginActivity">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
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-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 5c043b111..64213e0eb 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
   ~
   ~ This file is part of Loop Habit Tracker.
@@ -39,7 +38,7 @@
     <string name="toast_habit_archived">Habits archived</string>
     <string name="toast_habit_unarchived">Habits unarchived</string>
 
-    <string name="title_activity_show_habit" translatable="false"/>
+    <string name="title_activity_show_habit" translatable="false" />
     <string name="overview">Overview</string>
     <string name="habit_strength">Habit strength</string>
     <string name="history">History</string>
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;
     }