Updated with a few more chapters (from design doc)