adding the work I have already completed
merging