Adding weave to big-bang