WIP - First changes in CCombinedKernel