Broke subscription+ping storage out into a class