Adding more files and updating formatting