diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb176dc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.mypy_cache/
+__pycache__/
diff --git a/cheuph/__init__.py b/cheuph/__init__.py
new file mode 100644
index 0000000..992767a
--- /dev/null
+++ b/cheuph/__init__.py
@@ -0,0 +1,8 @@
+from typing import List
+
+from .markup import *
+from .message import *
+
+__all__: List[str] = []
+__all__ += markup.__all__
+__all__ += message.__all__
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 0000000..6fd0e6a
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,4 @@
+[mypy]
+disallow_untyped_defs = True
+disallow_incomplete_defs = True
+no_implicit_optional = True
diff --git a/source/tests/__init__.py b/source/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/source/tests/test_message.py b/source/tests/test_message.py
deleted file mode 100644
index 12bc465..0000000
--- a/source/tests/test_message.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import unittest
-
-from yaboli import message
-
-class TestMessage(unittest.TestCase):
-	def setUp(self):
-		pass
-	
-	def tearDown(self):
-		pass
-	
-	def test_message(self):
-		m = message.Message({ # older message
-			"edited": None,
-			"deleted": None,
-			"time": 1440104478,
-			"id": "00q5kdu2xd4ao",
-			"sender": {
-				"id": "agent:pxXsVkA4L2s=",
-				"name": "Garmy",
-				"server_id": "heim.1",
-				"server_era": "00q2lx69ur11c",
-				"session_id": "70785873566b41344c32733d-e27e0a924311bc4f",
-			},
-			"content": "I claim this room!"
-		})
-		self.assertEqual(m.id(),                      "00q5kdu2xd4ao"      )
-		self.assertEqual(m.parent(),                  None                 )
-		self.assertEqual(m.content(),                 "I claim this room!" )
-		self.assertEqual(m.sender().user_id(),        "agent:pxXsVkA4L2s=" )
-		self.assertEqual(m.time(),                    1440104478           )
-		self.assertEqual(m.time_formatted(),          "21:01:18"           )
-		self.assertEqual(m.time_formatted(date=True), "2015-08-20 21:01:18")
-		self.assertEqual(m.deleted(),                 False                )
-		
-		m = message.Message({ # newer message
-			"edited": None,
-			"deleted": None,
-			"time": 1460836596,
-			"id": "01dxs00kvhh4w",
-			"parent": "01dxrya95iark",
-			"sender": {
-				"id": "account:010nrwbcafx8g",
-				"name": "Xyzzy",
-				"server_id": "heim.4",
-				"server_era": "01cwcninm0feo",
-				"session_id": "44514577654132456c746b3d-bcf7c88ae84daebd",
-				"client_address": "9d13:4a20",
-				"is_manager": True,
-			},
-			"content": "Hello."
-		})
-		self.assertEqual(m.id(),                      "01dxs00kvhh4w"        )
-		self.assertEqual(m.parent(),                  "01dxrya95iark"        )
-		self.assertEqual(m.content(),                 "Hello."               )
-		self.assertEqual(m.sender().user_id(),        "account:010nrwbcafx8g")
-		self.assertEqual(m.time(),                    1460836596             )
-		self.assertEqual(m.time_formatted(),          "19:56:36"             )
-		self.assertEqual(m.time_formatted(date=True), "2016-04-16 19:56:36"  )
-		self.assertEqual(m.deleted(),                 False                  )
-
-if __name__ == '__main__':
-	unittest.main()
diff --git a/source/tests/test_session.py b/source/tests/test_session.py
deleted file mode 100644
index 2380e37..0000000
--- a/source/tests/test_session.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import unittest
-
-from yaboli import session
-
-class TestSession(unittest.TestCase):
-	def setUp(self):
-		pass
-	
-	def tearDown(self):
-		pass
-	
-	def test_session(self):
-		s = session.Session({
-			"id": "bot:ZktBH-UfJ7w=",
-			"name": "AssassinBot",
-			"server_era": "01cwcmytc5slc",
-			"server_id": "heim.3",
-			"session_id": "5a6b7442482d55664a37773d-6d4d86ecae939c59"
-		})
-		self.assertEqual(s.session_type(), "bot"                                      )
-		self.assertEqual(s.user_id(),      "bot:ZktBH-UfJ7w="                         )
-		self.assertEqual(s.session_id(),   "5a6b7442482d55664a37773d-6d4d86ecae939c59")
-		self.assertEqual(s.name(),         "AssassinBot"                              )
-		self.assertEqual(s.mentionable(),  "AssassinBot"                              )
-		self.assertEqual(s.listable(5),    ("", "Assa…")                              )
-		self.assertEqual(s.listable(10),   ("", "AssassinB…")                         )
-		self.assertEqual(s.listable(50),   ("", "AssassinBot")                        )
-		self.assertEqual(s.server_id(),    "heim.3"                                   )
-		self.assertEqual(s.server_era(),   "01cwcmytc5slc"                            )
-		self.assertEqual(s.is_staff(),     False                                      )
-		self.assertEqual(s.is_manager(),   False                                      )
-		
-		s = session.Session({
-			"id": "account:ZktBH-UfJ7w=",
-			"name": "my h^nds @re typin' wurd$",
-			"server_era": "01cwcmytc5slc",
-			"server_id": "heim.3",
-			"session_id": "5a6b7442482d55664a37773d-6d4d86ecae939c59",
-			"is_staff": True
-		})
-		self.assertEqual(s.session_type(), "account"                          )
-		self.assertEqual(s.name(),         "my h^nds @re typin' wurd$"        )
-		self.assertEqual(s.mentionable(),  "myh^nds@retypinwurd$"             )
-		self.assertEqual(s.listable(5),    ("*s", "my…")                      )
-		self.assertEqual(s.listable(10),   ("*s", "my h^nd…")                 )
-		self.assertEqual(s.listable(50),   ("*s", "my h^nds @re typin' wurd$"))
-		self.assertEqual(s.is_staff(),     True                               )
-		self.assertEqual(s.is_manager(),   False                              )
-		
-		s = session.Session({
-			"id": "account:ZktBH-UfJ7w=",
-			"name": "greenie",
-			"server_era": "01cwcmytc5slc",
-			"server_id": "heim.3",
-			"session_id": "5a6b7442482d55664a37773d-6d4d86ecae939c59",
-			"is_staff": True,
-			"is_manager": True
-		})
-		self.assertEqual(s.mentionable(), "greenie"         )
-		self.assertEqual(s.listable(5),   ("*ms", "g…")     )
-		self.assertEqual(s.listable(9),   ("*ms", "green…") )
-		self.assertEqual(s.listable(10),  ("*ms", "greenie"))
-		self.assertEqual(s.is_staff(),    True              )
-		self.assertEqual(s.is_manager(),  True              )
-
-if __name__ == '__main__':
-	unittest.main()