bunch of new code transition to native