half way through review design
working issues : 133 , 134
Issues 133 , 134