First cut of moving to incorporate kotlin code