Redo of first commit, this time with all files