Updated to use a service, almost forgot!