Native - This should start to resolve controller issues

The JNI activities are now more or less controller handling.

I'll wait to merge until it's all stable. You could call it pr6.5