Edits

See if you can merge this with squashing and preserving me as the original committer.