Adding the files necessary for the previous merge. - joel