More recent code, but still missing quite a bit.