ICSE14: Revised through most of sec3, added some TODOs