Story 5.5 complete and working

#90 @eldesouky @jihan2032 @attwa @omartarek