Update: New header
Update: Test C++