Made services work mostly
Fixing merge