First commit from Eli

Updated files from DropBox