Cuda/refactor-2 work-in-progress
Cuda/refactor-2 work-in-progress