Merged Jona's repo changes - Services working