diff --git a/.firebase/hosting.cHVibGlj.cache b/.firebase/hosting.cHVibGlj.cache
new file mode 100644
index 0000000..6f12cad
--- /dev/null
+++ b/.firebase/hosting.cHVibGlj.cache
@@ -0,0 +1,33 @@
+manifest.json,1633233618909,0958a5e0c831126100c8c2d06a6bbaa665a3900f21aaff4130238a6f5a113aa1
+index.html,1633233618909,ea6d2363912813960c57adc31324f6864859e2effc72eee14983dcdd37714ae6
+favicon.ico,1636730589435,011cbd96df07e40a2f08feed92ccc24c402389822daca4aad788babef6e576f4
+robots.txt,1633233618909,2544ca049f223a42bff01f72ad930a5edba75bbb7199d0f8430a02ff5aca16ec
+css_styles/styles.css.map,1633893347652,48880fa4e6702566de5db9652fffbd218a25957d3de1712182137b4fbce0f710
+css_styles/styles.css,1633893347656,57bf0a439651c8066b55c98941cfd43015097ab02c54ad737a17e38079fd01a3
+img/Rest Icon.png,1633233618913,b0185bcb35c9c1f9052b5804cc6bdee8591d1e32ef81c6f0429b7bbae1e942cc
+img/Working Icon.png,1633233618913,002aa3ae1cd0b33c1cf228f5e373d6a5d03caa27be29ff60aeb6cb54024bed55
+img/down-arrow.svg,1633233618913,cde1ea1df1cf1928541336a4a97124dfa669274520eb83f3b6b7e5577c46e42e
+img/favicon.ico,1633233618913,011cbd96df07e40a2f08feed92ccc24c402389822daca4aad788babef6e576f4
+sass_styles/_aboutThis.scss,1633233618913,73077618676d98a90e540b959d2087cbe62cd3022ea1c7b613c8afb2404f336c
+img/rest favicon.ico,1633233618913,ceb9193cdce36e5a28e757b478a83ad15c39347d74b085a361dcaba2b8d6c2de
+sass_styles/_banner-login.scss,1633233618913,38ae4fd54e3345934edaf7810461aefa04180a368dfa15808a14fa4681454d57
+sass_styles/_account.scss,1633233618913,dab0d3e267e0b007f2a64e951894192da2770fa8d412a18acb0023e94afc7e80
+sass_styles/_clockify-tasks-display.scss,1633233618913,887975eba031279dbe6b0b0b51c747f8b853c4d36ea4cff46bad025353b90c55
+sass_styles/_goDownArrow.scss,1633233618913,801745c1bd3ea111438032cb32b6e6b1ecc4f1513c391470bc663ce57a9058ac
+sass_styles/_dark-mode_toogle-switch.scss,1633233618913,8cd6250aa8193b0db67fb1697c7aa080126b06402a37dd9282d2a735a710491e
+sass_styles/_goToAccount.scss,1633233618917,734cfc58f4206591c9e7c2749279d899c8e0d8609d6ceb7ddd4848e00d3efbc9
+img/working favicon.ico,1633233618913,47baf8c6f08d382dbcaf3b36f75fe699fa73102f50826d2aca153c5c21fa1a5e
+img/clock.svg,1633233618913,3c3a8aa891623994fa93454b5266e854a3f3e482b1b6a92540e47aa1355ac466
+sass_styles/_historyButton.scss,1633233618917,b355057f7f295e4f6ddec9a5117eb152014f25ef012568a801a2066092594c6e
+sass_styles/_identify.scss,1633893339140,93165302617100b228f298663b81f3312cb8a1feff557cfe776442606fe44723
+sass_styles/_header.scss,1633475750851,6b494525ff9b38c6ece64776eb3e7f5f11b3b0eb5486a68632dbff8e028415d0
+sass_styles/_made-with-love.scss,1633233618917,b7735fc057899899b328b2766cce286d851752c6eeb6fdd320dd616905c62fa9
+sass_styles/_mainPomodoro.scss,1633233618917,926fcc280771e78975a775362bcfc990640eba4c1e15e0f1b92cff7d736e911d
+sass_styles/_pomodoro-counter.scss,1633233618917,3f9558100a880704895cab782fd64f22e253cb4309c4003ba2bdb81ce6bc1dfa
+img/Icon.png,1633233618909,96b9f24bfee11566a6523d4be1e30ef7b1915d92e8f849875b93f43817964d0f
+sass_styles/_styleSelector.scss,1633233618917,b80ed10a322a83fa2c2d396b52cd71dd18f9d88203f0788563e1aae740f6d2b2
+img/Icon.svg,1633233618913,1e645fe29bb64a0124f6e1556fd889a62ab91c2322085dcf04c4de7120b6d562
+sass_styles/styles.scss,1633475773287,927211f9b975ee748fa48a1622f407d129e46824a35fd86a313f89e21fa91444
+img/Rest Icon.psd,1633233618913,a4d221875e274d806cbfdcf8056ba2c98973e54df875ebd86037af1fedcc0419
+img/Working Icon.psd,1633233618913,acbf61179123109546a5385d37f7156d43c8ec30903745889704c2730aa83b05
+img/Icon.psd,1633233618913,469da2c6725044d173ac16a12e05b0aab3c044a6dc5c13f933e393555cfc3019
diff --git a/.firebaserc b/.firebaserc
new file mode 100644
index 0000000..0a1038a
--- /dev/null
+++ b/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "pomodoro-timer-clockify"
+  }
+}
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
new file mode 100644
index 0000000..e610341
--- /dev/null
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -0,0 +1,20 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - master
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_POMODORO_TIMER_CLOCKIFY }}'
+          channelId: live
+          projectId: pomodoro-timer-clockify
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
new file mode 100644
index 0000000..5b877fb
--- /dev/null
+++ b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,17 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_POMODORO_TIMER_CLOCKIFY }}'
+          projectId: pomodoro-timer-clockify
diff --git a/firebase.json b/firebase.json
new file mode 100644
index 0000000..bfcd1f9
--- /dev/null
+++ b/firebase.json
@@ -0,0 +1,16 @@
+{
+  "hosting": {
+    "public": "./public",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
+}
diff --git a/src/App.js b/src/App.js
index bffafbe..f6e958b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -103,6 +103,9 @@ function App() {
             />
 
             <ClockifyTasksDisplay
+
+              setTimerOn={setTimerOn}
+
               signIn={signIn}
               timerOn={timerOn}
 
diff --git a/src/components/ClockifyTasksDisplay.jsx b/src/components/ClockifyTasksDisplay.jsx
index 3bff50e..65c0a7a 100644
--- a/src/components/ClockifyTasksDisplay.jsx
+++ b/src/components/ClockifyTasksDisplay.jsx
@@ -219,6 +219,14 @@ const ClockifyTasksDisplay = (props) => {
                             value={props.taskName}
                             placeholder="Add task description"
                             className={props.projectID !== 0 ? null: 'disabled'}
+
+                            onKeyPress={event => {
+
+                                if (event.key === 'Enter') {
+
+                                    props.setTimerOn(true)
+                                }
+                            }}
                         />
                     </div>
                 : null
diff --git a/src/components/MainPomodoro.jsx b/src/components/MainPomodoro.jsx
index 45ac524..6c85281 100644
--- a/src/components/MainPomodoro.jsx
+++ b/src/components/MainPomodoro.jsx
@@ -36,7 +36,6 @@ const MainPomodoro = (props) => {
     
             setStartTime('')
             setEndTime('')
-            props.setTaskName('')
         }
     })