cpp and hpp should match now, will test shortly