Story 4.1 Story 4.2

issue #155 #257 
@karim-elbawab @osherifo @MennatallahElKharbotly @omartarek please review