Preliminary work for 257 (not working yet).