adding some of the merged files from Ericks last commit