More work
Add carla-native code