still working on refactoring and table client