More moves to vnext. Probably a bad idea