diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6593747..ab334df 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,7 @@ v2.0.0 (IN PROGRESS)
 * Improved docstring for visibility (Thanks @ashwinvis)
 * Added `offset` parameter to `trending_statuses` (Thanks @Teqed)
 * We're now using space age technology (pyproject.toml - thanks @codl)
+* Add py.typed marker (Thanks @ZeeD for the suggestion)
 
 v1.8.1
 ------
diff --git a/TODO.md b/TODO.md
index 9fc3c70..4554eb8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,14 +4,15 @@ Refer to mastodon changelog and API docs for details when implementing, add or m
 
 4.0.0 and beyond
 ----------------
-? ? ? ?
+* [ ] Document all the endpoints we need to add
 
 General improvements that would be good to do before doing another release
 --------------------------------------------------------------------------
 * [x] Split mastodon.py into parts in some way that makes sense, it's getting very unwieldy
-* [x] Fix the CI
+* [x] Fix the CI (forever task)
 * [ ] Get test coverage like, real high
 * [x] Add all those streaming events??
-* [ ] Document return values (skipping this for a bit to then do it at the end with tooling)
-    * [ ] Do this with models properly, that would be cool as heck
-* [ ] Add links to mastodon docs to entities and endpoints
\ No newline at end of file
+* [x] Document return values (skipping this for a bit to then do it at the end with tooling)
+    * [x] Do this with models properly, that would be cool as heck
+* [x] Add links to mastodon docs to entities and endpoints
+* [ ] Also add links to tests to the docstrings so people can see usage examples
\ No newline at end of file
diff --git a/mastodon/py.typed b/mastodon/py.typed
new file mode 100644
index 0000000..e69de29