Getting ready to merge in the RC
Started making a clean merge of the rc functions