adding in the header files
Fixing a merge problem
working on header