Add Ghost Slots
Add Ghost Slots, resolve merge conflicts