Story 5.7 ready and working

#172 
@eldesouky @jihan2032 @omartarek @attwa @andrewkhouzam