S000: Adding in some of the mess of files.