First round of edits.  Cutting out sections for separate files.