C3S5 Add Question to the design

#137 @maged918 @ytarek @amatar07