wip: working an a table version, removed datatable for now