diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 13114da..baa75e3 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -211,9 +211,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2179,6 +2179,7 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 name = "libdrcr"
 version = "0.1.0"
 dependencies = [
+ "async-trait",
  "chrono",
  "downcast-rs 2.0.1",
  "dyn-clone",
diff --git a/src-tauri/src/libdrcr_bridge.rs b/src-tauri/src/libdrcr_bridge.rs
index 661528d..aabeee8 100644
--- a/src-tauri/src/libdrcr_bridge.rs
+++ b/src-tauri/src/libdrcr_bridge.rs
@@ -28,7 +28,6 @@ use libdrcr::reporting::types::{
 };
 use tauri::State;
 use tokio::sync::Mutex;
-use tokio::task::spawn_blocking;
 
 use crate::AppState;
 
@@ -40,55 +39,51 @@ pub(crate) async fn get_balance_sheet(
 	let state = state.lock().await;
 	let db_filename = state.db_filename.clone().unwrap();
 
-	spawn_blocking(move || {
-		// Connect to database
-		let db_connection =
-			DbConnection::connect(format!("sqlite:{}", db_filename.as_str()).as_str());
+	// Connect to database
+	let db_connection =
+		DbConnection::new(format!("sqlite:{}", db_filename.as_str()).as_str()).await;
 
-		// Initialise ReportingContext
-		let eofy_date = db_connection.metadata().eofy_date;
-		let mut context = ReportingContext::new(db_connection, eofy_date, "$".to_string());
-		register_lookup_fns(&mut context);
-		register_dynamic_builders(&mut context);
+	// Initialise ReportingContext
+	let eofy_date = db_connection.metadata().eofy_date;
+	let mut context = ReportingContext::new(db_connection, eofy_date, "$".to_string());
+	register_lookup_fns(&mut context);
+	register_dynamic_builders(&mut context);
 
-		// Get balance sheet
-		let mut date_args = Vec::new();
-		for date in dates.iter() {
-			date_args.push(DateArgs {
-				date: NaiveDate::parse_from_str(date, "%Y-%m-%d").unwrap(),
-			})
-		}
-		let targets = vec![
-			ReportingProductId {
-				name: "CalculateIncomeTax",
-				kind: ReportingProductKind::Transactions,
-				args: Box::new(VoidArgs {}),
-			},
-			ReportingProductId {
-				name: "BalanceSheet",
-				kind: ReportingProductKind::Generic,
-				args: Box::new(MultipleDateArgs {
-					dates: date_args.clone(),
-				}),
-			},
-		];
+	// Get balance sheet
+	let mut date_args = Vec::new();
+	for date in dates.iter() {
+		date_args.push(DateArgs {
+			date: NaiveDate::parse_from_str(date, "%Y-%m-%d").unwrap(),
+		})
+	}
+	let targets = vec![
+		ReportingProductId {
+			name: "CalculateIncomeTax",
+			kind: ReportingProductKind::Transactions,
+			args: Box::new(VoidArgs {}),
+		},
+		ReportingProductId {
+			name: "BalanceSheet",
+			kind: ReportingProductKind::Generic,
+			args: Box::new(MultipleDateArgs {
+				dates: date_args.clone(),
+			}),
+		},
+	];
 
-		// Run report
-		let products = generate_report(targets, &context).unwrap();
-		let result = products
-			.get_or_err(&ReportingProductId {
-				name: "BalanceSheet",
-				kind: ReportingProductKind::Generic,
-				args: Box::new(MultipleDateArgs { dates: date_args }),
-			})
-			.unwrap();
+	// Run report
+	let products = generate_report(targets, &context).await.unwrap();
+	let result = products
+		.get_or_err(&ReportingProductId {
+			name: "BalanceSheet",
+			kind: ReportingProductKind::Generic,
+			args: Box::new(MultipleDateArgs { dates: date_args }),
+		})
+		.unwrap();
 
-		let balance_sheet = result.downcast_ref::<DynamicReport>().unwrap().to_json();
+	let balance_sheet = result.downcast_ref::<DynamicReport>().unwrap().to_json();
 
-		Ok(balance_sheet)
-	})
-	.await
-	.unwrap()
+	Ok(balance_sheet)
 }
 
 #[tauri::command]
@@ -99,54 +94,50 @@ pub(crate) async fn get_income_statement(
 	let state = state.lock().await;
 	let db_filename = state.db_filename.clone().unwrap();
 
-	spawn_blocking(move || {
-		// Connect to database
-		let db_connection =
-			DbConnection::connect(format!("sqlite:{}", db_filename.as_str()).as_str());
+	// Connect to database
+	let db_connection =
+		DbConnection::new(format!("sqlite:{}", db_filename.as_str()).as_str()).await;
 
-		// Initialise ReportingContext
-		let eofy_date = db_connection.metadata().eofy_date;
-		let mut context = ReportingContext::new(db_connection, eofy_date, "$".to_string());
-		register_lookup_fns(&mut context);
-		register_dynamic_builders(&mut context);
+	// Initialise ReportingContext
+	let eofy_date = db_connection.metadata().eofy_date;
+	let mut context = ReportingContext::new(db_connection, eofy_date, "$".to_string());
+	register_lookup_fns(&mut context);
+	register_dynamic_builders(&mut context);
 
-		// Get income statement
-		let mut date_args = Vec::new();
-		for (date_start, date_end) in dates.iter() {
-			date_args.push(DateStartDateEndArgs {
-				date_start: NaiveDate::parse_from_str(date_start, "%Y-%m-%d").unwrap(),
-				date_end: NaiveDate::parse_from_str(date_end, "%Y-%m-%d").unwrap(),
-			})
-		}
-		let targets = vec![
-			ReportingProductId {
-				name: "CalculateIncomeTax",
-				kind: ReportingProductKind::Transactions,
-				args: Box::new(VoidArgs {}),
-			},
-			ReportingProductId {
-				name: "IncomeStatement",
-				kind: ReportingProductKind::Generic,
-				args: Box::new(MultipleDateStartDateEndArgs {
-					dates: date_args.clone(),
-				}),
-			},
-		];
+	// Get income statement
+	let mut date_args = Vec::new();
+	for (date_start, date_end) in dates.iter() {
+		date_args.push(DateStartDateEndArgs {
+			date_start: NaiveDate::parse_from_str(date_start, "%Y-%m-%d").unwrap(),
+			date_end: NaiveDate::parse_from_str(date_end, "%Y-%m-%d").unwrap(),
+		})
+	}
+	let targets = vec![
+		ReportingProductId {
+			name: "CalculateIncomeTax",
+			kind: ReportingProductKind::Transactions,
+			args: Box::new(VoidArgs {}),
+		},
+		ReportingProductId {
+			name: "IncomeStatement",
+			kind: ReportingProductKind::Generic,
+			args: Box::new(MultipleDateStartDateEndArgs {
+				dates: date_args.clone(),
+			}),
+		},
+	];
 
-		// Run report
-		let products = generate_report(targets, &context).unwrap();
-		let result = products
-			.get_or_err(&ReportingProductId {
-				name: "IncomeStatement",
-				kind: ReportingProductKind::Generic,
-				args: Box::new(MultipleDateStartDateEndArgs { dates: date_args }),
-			})
-			.unwrap();
+	// Run report
+	let products = generate_report(targets, &context).await.unwrap();
+	let result = products
+		.get_or_err(&ReportingProductId {
+			name: "IncomeStatement",
+			kind: ReportingProductKind::Generic,
+			args: Box::new(MultipleDateStartDateEndArgs { dates: date_args }),
+		})
+		.unwrap();
 
-		let income_statement = result.downcast_ref::<DynamicReport>().unwrap().to_json();
+	let income_statement = result.downcast_ref::<DynamicReport>().unwrap().to_json();
 
-		Ok(income_statement)
-	})
-	.await
-	.unwrap()
+	Ok(income_statement)
 }