working on the merge
working on the merge
added all the new files I created