First round of changing tables
Merge with master