Pulling over changes

Let's try this before I commit anything else...

My copies are backed up, but it doesn't look like it's being affected.