Reassigned numbers for each table.

Still WIP.