Feature/cpp migration

Testing