1.1 and 1.2 and 1.8

@kalamoni  @andrewkhouzam @abdelrahmansakr  the three stories #152 #153 #154 you can review them all ....!