Refactor 2

Adding some stuff missing from the first table refactor.