second commit. a lot of edits.