fnishing off wishlist map
massive commit