V0.3.0 rc

Pull this back out into a service method