More building blocks, mostly ready