Updated filenames and added some more work.