Flushing out the last wip. add concept of a wishlist