Added comments
Merge remote-tracking branch 'origin/master'
Updated service factory to use strings
Implemented priority system