TODO

Added:
- Various TODO items.

Changes:
- Cleaned up some of the TODO stuff.