Reafctored user code, added wishlist concept