Improve table creation
Start adding joins + s/s4/s8/g