Changed the service completely

Built a completely new service