Re-committing

Apparently not all of my files were committed last night. So let's try
this again.