Services and initial run functions working perfectly
Merge branch 'ari-mapdesign'