I suspect we'll need basically a full rewrite