Ray Merge

Merged services into one file and resolved conflicts.