Revert "La till en ny cpp"

This reverts commit 2c1434921a6ce509d98c198642526f2b66eb0912.
Revert "Revert "La till en ny cpp""

This reverts commit 109599bb88c91f9cec072e5abb1d4f5b24b65373.