diff --git a/.gitignore b/.gitignore
index 3ca43ae..a84f36c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ Cargo.lock
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 
+# Vim swapfiles
+*.swp
diff --git a/src/dns.rs b/src/dns.rs
new file mode 100644
index 0000000..6bf487a
--- /dev/null
+++ b/src/dns.rs
@@ -0,0 +1,13 @@
+use crate::{Probe, ProbeResult};
+use trust_dns_client::client::Client;
+
+// DNS probe
+
+pub struct DnsProbe {
+}
+
+impl Probe for DnsProbe {
+    fn execute() -> ProbeResult {
+        unimplemented!();
+    }
+}
diff --git a/src/http.rs b/src/http.rs
new file mode 100644
index 0000000..768c3a3
--- /dev/null
+++ b/src/http.rs
@@ -0,0 +1,31 @@
+use crate::{Probe, ProbeResult};
+use url::Url;
+
+use std::net::SocketAddr;
+
+#[derive(Debug)]
+pub enum HttpError {
+    UrlError(url::ParseError)
+}
+
+// HTTP probe
+//
+pub struct HttpProbe {
+    remote_addr: SocketAddr
+}
+
+impl HttpProbe {
+    pub fn get(url: &str) -> Result<HttpProbe, HttpError> {
+        let request = url::Url::parse(url)
+            .map_err(HttpError::UrlError);
+
+        unimplemented!();
+    }
+}
+
+impl Probe for HttpProbe {
+    fn execute() -> ProbeResult {
+        unimplemented!();
+    }
+}
+
diff --git a/src/main.rs b/src/main.rs
index 6b8b12a..af7b5f1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,9 @@
 use unicorn_hat_hd_2::UnicornHatHd;
-use url::Url;
 
-use std::net::SocketAddr;
+use self::http::HttpProbe;
+
+mod dns;
+mod http;
 
 pub trait Probe {
     fn execute() -> ProbeResult;
@@ -21,26 +23,6 @@ pub struct ProbeMetrics {
     pub latency_ms: u32
 }
 
-// HTTP probe
-//
-pub struct HttpProbe {
-    remote_addr: SocketAddr
-}
-
-impl Probe for HttpProbe {
-    fn execute() -> ProbeResult {
-        unimplemented!();
-    }
-}
-
-// DNS probe
-
-pub struct DnsProbe {
-    fn execute() -> ProbeResult {
-        unimplemented!();
-    }
-}
-
 fn main() {
     let mut hat_hd = UnicornHatHd::default();
 
@@ -50,5 +32,9 @@ fn main() {
     //hat_hd.set_pixel(x, y, [255, 255, 255].into());
     //hat_hd.display().unwrap();
 
+    let probes = vec![ 
+        HttpProbe::get("https://google.co.uk").expect("Failed to parse URL")
+    ];
+
 }