Partial commit

Partial commit because a bug in the GitHub client for Mac made me lose
five hours of work.