Moving things around, adding roles and other chef bits.