diff --git a/TODO b/TODO
index c2ae5fa..2ef25be 100644
--- a/TODO
+++ b/TODO
@@ -23,16 +23,13 @@ Medium Tasks:
 
 Big Tasks:
 
+  . Shift the code so it doesn't pollute the global namespace; that
+    will make it more usable as an embed or library
+
   . Generate messages + enums from spice.proto
 
-  . Video + Audio:
-    - Need either ogg or webm codec
-    - Probably need a codec other than celt 0.51
-    - Need a way to feed stream into a media object
-      * Javascript uri?
-      * best would be  Media Source Extensions draft, but only in Chrome so far
-      * some trick with createObjectUrl?  see:
-        - http://dev.w3.org/2011/webrtc/editor/getusermedia.html
+  . Video:
+    - Need to pick a video codec and get support for it into spice server
 
   . Explore clipboard
     - Supporting it may require unpleasant hacks