Playing with a new table format
Merge branch 'tabled-edit'