Added beginnings of atomic builds