diff --git a/API.js b/API.js
index dbf3c8b..002baea 100644
--- a/API.js
+++ b/API.js
@@ -10,14 +10,9 @@
 // Need to split out rendering and book completely
 // Something like
 var epub = ePub("moby-dick.epub");
-var epub = ePub("s3path/ip/moby-dick.opf");
-
-var rendition = ePub.Paginate(epub);
-
-var rendition = ePub.Render.Paginated(book);
-var rendition = ePub.Render.Scrolling(book);
-
-ePub.renderer.register(EPUBJS.Paginate);
+var epub = ePub("http://s3path/ip/moby-dick.opf");
+// or
+var epub = new EPUBJS.Book("http://s3path/ip/moby-dick.opf");
 
 // Returns a Scroll Controller, Attachs to a document (or window?)
 var epub = ePub("moby-dick.epub");
@@ -69,9 +64,20 @@ book.navigation.get("chap1.html")
 //-- When does the chapter content processing happen?
 section.render() 
 
-// Returns a new renderer
-var rendition = epub.renderer(book, type);
-    return new Renderer(book, type)
+// Create a new renderer
+var rendition = ePub.Render(book, EPUBJS.Paginated, {options: true});
+// is the same as
+var rendition = new EPUBJS.Paginated(book, {options: true});
+
+var rendition = ePub.Render(book); // Defaults
+var rendition = ePub.Render(book, EPUBJS.Render.Paginated, options);
+var rendition = ePub.Render.Paginated(book);
+var rendition = ePub.Render.Scrolling(book);
+
+rendition.render(book) // if not passed
+
+ePub.renderer.register("Paginated", EPUBJS.Render.Paginated);
+
 
 // Render to a div
 rendition.attachTo("elementID");
diff --git a/examples/basic-dev.html b/examples/basic-dev.html
index 7df78fc..b820365 100644
--- a/examples/basic-dev.html
+++ b/examples/basic-dev.html
@@ -79,9 +79,8 @@
     var currentSection;
     var currentSectionIndex = 7;
 
-    var book = ePub("https://s3.amazonaws.com/moby-dick/OPS/package.opf");
-    book.loaded.navigation.then(function(nav){
-      var toc = nav.get();
+    var book = ePub("../books/moby-dick/OPS/package.opf");
+    book.loaded.navigation.then(function(toc){
       var $select = document.getElementById("toc"),
           docfrag = document.createDocumentFragment();
 
diff --git a/lib/epubjs/book.js b/lib/epubjs/book.js
index 848df8d..c20e4e2 100644
--- a/lib/epubjs/book.js
+++ b/lib/epubjs/book.js
@@ -137,7 +137,7 @@ EPUBJS.Book.prototype.unpack = function(packageXml){
   book.navigation = new EPUBJS.Navigation(book.package, this.request);
   book.navigation.load().then(function(toc){
     book.toc = toc;
-    book.loading.navigation.resolve(book.navigation);
+    book.loading.navigation.resolve(book.toc);
   });
   
   // //-- Set Global Layout setting based on metadata