Pulling more code from services and creating common methods.
Merge remote-tracking branch 'origin/master'