Simplify the `new` `wrap` mechanics

Everything goes through new now