intermediate checkpoint of rewrite source
Move away from original DataTables to new style