diff --git a/Taskfile.yml b/Taskfile.yml
index e335acc..e8e2240 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -4,6 +4,7 @@ version: "3"
 
 vars:
   GREETING: Hello, World!
+  PARENT_BRANCH: main
 
 tasks:
   test:
@@ -31,7 +32,9 @@ tasks:
     deps: [check]
     cmds:
       - git is-clean
-      - git checkout main
+      # did we had tests?
+      - git diff-ls  {{.PARENT_BRANCH}} | grep test
+      - git checkout {{.PARENT_BRANCH}}
       - git weld -
 
   release:
diff --git a/src/lib/components/ShipEdit/Structure/Armor.svelte b/src/lib/components/ShipEdit/Structure/Armor.svelte
index c63e79c..31744f3 100644
--- a/src/lib/components/ShipEdit/Structure/Armor.svelte
+++ b/src/lib/components/ShipEdit/Structure/Armor.svelte
@@ -27,7 +27,7 @@
 
   const api = getContext("api");
 
-  $: api.dispatch.setNbrArmorLayers(nbr_layers);
+  $: api?.dispatch.setNbrArmorLayers(nbr_layers);
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Structure/Hull.svelte b/src/lib/components/ShipEdit/Structure/Hull.svelte
index 0a03589..7bbb4d7 100644
--- a/src/lib/components/ShipEdit/Structure/Hull.svelte
+++ b/src/lib/components/ShipEdit/Structure/Hull.svelte
@@ -17,7 +17,7 @@
 
   const api = getContext("api");
 
-  $: api.dispatch?.setHull?.(rating);
+  $: api?.dispatch?.setHull?.(rating);
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Structure/Screens.svelte b/src/lib/components/ShipEdit/Structure/Screens.svelte
index 9cfd561..2086575 100644
--- a/src/lib/components/ShipEdit/Structure/Screens.svelte
+++ b/src/lib/components/ShipEdit/Structure/Screens.svelte
@@ -23,7 +23,7 @@
 
   const api = getContext("api");
 
-  $: api.dispatch?.setScreens?.({ standard, advanced });
+  $: api?.dispatch?.setScreens?.({ standard, advanced });
 </script>
 
 <style>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 1333ed7..8830a2f 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1 +1,5 @@
-TODO
+<ShipEdit />
+
+<script>
+  import ShipEdit from "$lib/components/ShipEdit.svelte";
+</script>
diff --git a/src/routes/page.test.js b/src/routes/page.test.js
new file mode 100644
index 0000000..895c08d
--- /dev/null
+++ b/src/routes/page.test.js
@@ -0,0 +1,9 @@
+import { render, fireEvent, screen, getByText } from "@testing-library/svelte";
+import "@testing-library/jest-dom";
+
+import Page from "./+page.svelte";
+
+test("we have a page", () => {
+  const { getByText } = render(Page);
+  expect(getByText("propulsion")).toBeInTheDocument();
+});