diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d935c9..d7e62b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,8 @@ add_executable(park
         headers/Park_time.h
         encrypt.cpp
         headers/encrypt.h
+        Query.cpp
+        headers/Query.h
  )
 
 
diff --git a/Park_time.cpp b/Park_time.cpp
index 963a53d..f2a4311 100644
--- a/Park_time.cpp
+++ b/Park_time.cpp
@@ -19,7 +19,6 @@ Park_time::Park_time(int id_, int customer_id_, int spot_id_, int start_,
     end = time_point<system_clock>(seconds(start_ + duration_));
 }
 
-Park_time::~Park_time() { update_db(); }
 
 void Park_time::clock_out(int c_id, int s_id) {
 
diff --git a/Query.cpp b/Query.cpp
new file mode 100644
index 0000000..6cda385
--- /dev/null
+++ b/Query.cpp
@@ -0,0 +1,50 @@
+#include "headers/Query.h"
+
+vector<Park_time> query_Parktime_for_customer(int cid) {
+    /*
+    This is needed to initialize the park_instances for the customer constructor
+    that is supposed to create a customer from data in the db.
+    This should not be called on on it's own outside query_customer();
+     */
+    vector<Park_time> park_times;
+
+    SQLite::Statement query(data::db,
+                            "SELECT * FROM Park_time WHERE customer_id = ?;");
+    query.bind(1, cid);
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int spot_id = query.getColumn(2);
+        int start = query.getColumn(3);
+        int duration = query.getColumn(5);
+
+        Park_time result{id, cid, spot_id, start, duration};
+        park_times.push_back(result);
+    }
+    query.reset();
+    return park_times;
+}
+
+vector<Customer> query_customer_with_name(string name) {
+    /*
+    We use this instead of plain customers because:
+    1. no error handling needed here if there are no customers
+    2. multiple customers could be returned with the same name.
+     */
+    vector<Customer> result;
+    SQLite::Statement query(data::db,
+                            "SELECT * FROM Customer WHERE name = '?';");
+    query.bind(1, name);
+    while (query.executeStep()) {
+        // (id integer primary key, name text, card_code varchar(20), verhicle
+        // int) (int id_, string name_, string card_code_, Verhicle_type
+        // verhicle_, vector<Park_time> instances)
+
+        int id = query.getColumn(0);
+        string name = query.getColumn(1);
+        string password = query.getColumn(2);
+        // int verhicle = query.getColumn(3); // cast to verhicle
+        vector<Park_time> park_instances = query_Parktime_for_customer(id);
+        // result.push_back(Customer{id, name, password, Verhicle_type(verhicle), park_instances});
+    }
+    return result;
+}
\ No newline at end of file
diff --git a/headers/Park_time.h b/headers/Park_time.h
index 49ab9ea..0c295d0 100644
--- a/headers/Park_time.h
+++ b/headers/Park_time.h
@@ -24,7 +24,6 @@ class Park_time {
     Park_time(int c_id, int s_id);
     Park_time(int id_, int customer_id_, int spot_id_, int start_,
               int duration_);
-    ~Park_time();
     int id;
     int customer_id;
     int spot_id;
diff --git a/headers/Query.h b/headers/Query.h
new file mode 100644
index 0000000..c618d31
--- /dev/null
+++ b/headers/Query.h
@@ -0,0 +1,14 @@
+#ifndef QUERY_H
+#define QUERY_H
+#pragma once
+
+#include "Park_spot.h"
+
+#include <exception>
+#include <array>
+
+vector<Park_time> query_Parktime_for_customer(int cid);
+vector<Customer> query_customer_with_name(string name);
+
+
+#endif // CUSTOMER_H
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 8ca82c6..c6a9b89 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,6 @@
-#include "headers/Park_spot.h"
+#include "headers/Query.h"
 
+#include <array>
 #include <thread>
 
 
@@ -28,20 +29,33 @@ a wait function where 1 sec represents 1 hour irl.
 
 int main() {
     class Customer sagar {
-        "Sagar Ramsaransing", Verhicle_type::bike
+        "query", Verhicle_type::bike
     };
     sagar.update_db();
     Park_spot p1;
+    p1.clock(&sagar); // in
+    Wait(2);
     p1.clock(&sagar);
-    // Wait(2);
-    // p1.clock(&sagar);
-    string a = hash_password("test");
-    string b = hash_password("test");
-    string c = hash_password("test");
-    string d = hash_password("tast");
-    cout << a << "\n" << b << "\n" << c << "\n";
-    cout << verify_password(a, "test") << "," 
-         << verify_password(b, "test") << ", " 
-         << verify_password(c, "test") << ", " 
-         << verify_password(d, "test");
-}
+    Wait(2);
+    p1.clock(&sagar); // in
+    Wait(2);
+    p1.clock(&sagar);
+    Wait(2);
+    p1.clock(&sagar); // in
+    Wait(2);
+    p1.clock(&sagar);
+    Wait(2);
+
+    vector<Customer> test = query_customer_with_name("query");
+    if (!test.size()){
+        cout << "No customers with this name found;";
+    }
+    else if (test.size()==1) {
+        cout << "1 customer found;";
+    }
+    else {
+        cout << "MORE customers found?";
+    }
+
+
+}
\ No newline at end of file
diff --git a/test.db3 b/test.db3
index d1b5a9b..126855f 100644
Binary files a/test.db3 and b/test.db3 differ