More changes that I haven't backed up
Merge branch 'part-0'

because it is.