Work in progress (oh, again).