More work on table controller replacement.