Files need to be renamed, and redundancy needs to be removed. But alas...progress