3rd commit of the files, early version