added some of the unmerged files with master