More commits, building blocks