Added friendship and rolls, revamped wishlists