More work on table setup.