diff --git a/.gitmodules b/.gitmodules
index 7004e32..5722e59 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "spi/spi"]
 	path = spi/spi
 	url = git@git.blackmark.me:avr/spi.git
+[submodule "spi/io"]
+	path = spi/io
+	url = git@git.blackmark.me:avr/io.git
diff --git a/spi/io b/spi/io
new file mode 160000
index 0000000..80de36e
--- /dev/null
+++ b/spi/io
@@ -0,0 +1 @@
+Subproject commit 80de36ee7ee3e6b0842d5eaee81d54062cb496b2
diff --git a/spi/main.cpp b/spi/main.cpp
index e153ef7..7ed23f0 100644
--- a/spi/main.cpp
+++ b/spi/main.cpp
@@ -1,6 +1,19 @@
 #include "clock.hpp"
 
-void spiTest() {}
+#include "spi/spi.hpp"
+
+void spiTest()
+{
+	using namespace spi;
+
+	using cfg = Config<ClockDiv::DIV_128, Mode::MODE_0, Side::MASTER, BitOrder::MSB_FIRST, false>;
+	using driver = Hardware<cfg>;
+
+	Spi<driver> spiDriver;
+	spiDriver.init();
+	spiDriver.select(true);
+	spiDriver.transfer(0xff);
+}
 
 int main()
 {
diff --git a/spi/spi b/spi/spi
index 7a1761e..70aabc0 160000
--- a/spi/spi
+++ b/spi/spi
@@ -1 +1 @@
-Subproject commit 7a1761e054faf44d168557406873434fff47a5ac
+Subproject commit 70aabc07f64a33b04e3e9ee00627f5c120b1f9ef
diff --git a/spi/spi.cppproj b/spi/spi.cppproj
index 37950d3..d652724 100644
--- a/spi/spi.cppproj
+++ b/spi/spi.cppproj
@@ -179,17 +179,24 @@
     <Compile Include="clock.hpp">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="io\io.hpp">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="main.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="spi\spi.cpp">
+    <Compile Include="spi\config.hpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="spi\spi.h">
+    <Compile Include="spi\hardware.hpp">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="spi\spi.hpp">
       <SubType>compile</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="io" />
     <Folder Include="spi" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />