diff --git a/Cargo.lock b/Cargo.lock
index 18d3b42..1c95a46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,6 +71,7 @@ dependencies = [
  "rocket_contrib",
  "serde",
  "thirtyfour",
+ "tokio",
  "toml",
 ]
 
@@ -700,12 +701,24 @@ dependencies = [
  "kernel32-sys",
  "libc",
  "log",
- "miow",
+ "miow 0.2.1",
  "net2",
  "slab",
  "winapi 0.2.8",
 ]
 
+[[package]]
+name = "mio-named-pipes"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
+dependencies = [
+ "log",
+ "mio",
+ "miow 0.3.5",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "mio-uds"
 version = "0.6.8"
@@ -729,6 +742,16 @@ dependencies = [
  "ws2_32-sys",
 ]
 
+[[package]]
+name = "miow"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
+dependencies = [
+ "socket2",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.4"
@@ -1518,6 +1541,7 @@ dependencies = [
  "libc",
  "memchr",
  "mio",
+ "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite",
diff --git a/Cargo.toml b/Cargo.toml
index c07abcb..bc6e03e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ color-eyre = "0.5.6"
 lazy_static = "1.4.0"
 serde = "1.0.116"
 toml = "0.5.6"
+tokio = { version = "0.2.22", features = ["process", "sync"] }
 
 [dependencies.rocket]
 git = "https://github.com/SergioBenitez/Rocket"
diff --git a/src/main.rs b/src/main.rs
index a8194d2..662e53d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,16 +1,19 @@
 use color_eyre::Result;
 use lazy_static::lazy_static;
-use rocket::{get, launch, routes, tokio, Rocket};
+use rocket::{get, routes, Rocket};
 use rocket_contrib::json::Json;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
-use std::process::{Child, Command, Stdio};
+use std::process::Stdio;
 use std::sync::Mutex;
 use std::thread;
 use std::time::{Duration, SystemTime};
 use thirtyfour::prelude::*;
 use tokio::fs::File;
 use tokio::prelude::*;
+use tokio::process::{Child, Command};
+use tokio::sync::oneshot::Receiver;
+use tokio::time::delay_for;
 
 /// The port used by the Gecko Driver
 const GECKO_DRIVER_PORT: u16 = 18019;
@@ -43,19 +46,15 @@ impl GeckoDriver {
             .stdin(Stdio::null())
             .stderr(Stdio::null())
             .stdout(Stdio::null())
+            .kill_on_drop(true)
             .spawn()?;
+
         thread::sleep(Duration::new(1, 500));
 
         Ok(GeckoDriver(child))
     }
 }
 
-impl Drop for GeckoDriver {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-    }
-}
-
 #[derive(Clone, Copy, Debug, Serialize)]
 struct Status {
     current_w: u32,
@@ -101,10 +100,9 @@ lazy_static! {
     static ref STATUS: Mutex<Option<Status>> = Mutex::new(None);
 }
 
-async fn update_loop() -> Result<()> {
+async fn update_loop(mut rx: Receiver<()>) -> Result<()> {
     color_eyre::install()?;
 
-    let _gecko_driver = GeckoDriver::spawn(GECKO_DRIVER_PORT)?;
     let mut caps = DesiredCapabilities::firefox();
     caps.set_headless()?;
     let driver = WebDriver::new(&format!("http://localhost:{}", GECKO_DRIVER_PORT), &caps).await?;
@@ -112,7 +110,24 @@ async fn update_loop() -> Result<()> {
     // Go to the My Autarco site and login
     login(&driver).await?;
 
+    let mut last_updated = 0;
     loop {
+        // Wait the poll interval to check again!
+        delay_for(Duration::from_secs(1)).await;
+
+        // Shut down if there is a signal
+        if let Ok(()) = rx.try_recv() {
+            break;
+        }
+
+        let timestamp = SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+        if timestamp - last_updated < POLL_INTERVAL {
+            continue;
+        }
+
         // Retrieve the data from the elements
         let current_w = match element_value(&driver, By::Css("h2#pv-now b")).await {
             Ok(value) => value,
@@ -128,10 +143,7 @@ async fn update_loop() -> Result<()> {
                 continue;
             }
         };
-        let last_updated = SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .unwrap()
-            .as_secs();
+        last_updated = timestamp;
 
         // Update the status
         let mut status_guard = STATUS.lock().expect("Status mutex was poisoned");
@@ -142,22 +154,34 @@ async fn update_loop() -> Result<()> {
         };
         println!("Updated status to: {:#?}", status);
         status_guard.replace(status);
-        drop(status_guard);
-
-        // Wait the poll interval to check again!
-        thread::sleep(Duration::from_secs(POLL_INTERVAL));
     }
+
+    Ok(())
 }
 
 #[get("/", format = "application/json")]
 async fn status() -> Option<Json<Status>> {
-    let status_guard = STATUS.lock().expect("Status mutex was poisoned");
+    let status_guard = STATUS.lock().expect("Status mutex was poisoined");
     status_guard.map(|status| Json(status))
 }
 
-#[launch]
 fn rocket() -> Rocket {
-    tokio::spawn(update_loop());
-
     rocket::ignite().mount("/", routes![status])
 }
+
+#[rocket::main]
+async fn main() {
+    let gecko_driver =
+        GeckoDriver::spawn(GECKO_DRIVER_PORT).expect("Could not find/start the Gecko Driver");
+    let (tx, rx) = tokio::sync::oneshot::channel();
+    let updater = tokio::spawn(update_loop(rx));
+
+    let result = rocket().launch().await;
+    result.expect("Server failed unexpectedly");
+
+    tx.send(())
+        .expect("Could not send update loop shutdown signal");
+    let _result = updater.await;
+
+    drop(gecko_driver);
+}