Implementing Services

Services are not working atm.
Merge branch 'master' into gh-pages