WIP push c++ header stuff to continue working on