More udpates to headers. Compilation tested to pass. unit tests pass.

More updates to header files. 
Compilation: pass
Unit tests: pass