Finally adding file2

Hey. This is feature 21412 done. Please add it to the master repo.