TODO: Add some items.
Revert "Multiple TODO changes"

This reverts commit 6ceabffc655cafa4d45c473cbb29ed832c383b7a.

Conflicts:
	docs/misc/TODO