Started refactoring away code for new services layer.