Some stuff from Peter

Trying my pull request all the way from my local repo.