Putting clustering back in.
Factor settings into load-partitioned.
Create tables in two distinct waves.