Start pulling the ideas from the experimental cotillon branch back in