Do more stuff with native, fix requires throughout