-Refactor to have entire table outside