Added more to service, added intents and checking on data