Added all appropriate files
fixed merged