Much closer. Adding the cart block and a lot of the layout logic.