Add more of the files
More testing