added some things about promises, services and  stuff