I lied. more edits/reorg.