A bit more work on the mem stuff.