Turned it into a proper service with full functionality