WIP converting to datatables