Data tables now working