Story 4.1 

#155 please review and merge 
@osherifo @ZzimBoo91 @karim-elbawab @karim-elbawab @MennatallahElKharbotly