merged orders and order front-end controllers.  starting on the wishlist functionality