Cleaning up a lot of DS in files
adding a wishlist helper first  step toward better wishlists