Intermediate Commit - Additional mods to Cake Marketing integration