Refactored all services; temporary commenting out network config except EM