Fixed up some remnants of when data was a pointer
Include the cpp at the end of the h