Services refactoring

Rails request conflicts need correcting