It's pretty close to done.  Have to test on higher-mem.