More work on improved table controller.