added cart stuff and master/detail