randall's
adding more files
fixing merge