Started implementing Customer View