Pull Request C5 - Share Performance - Story 5.2, 5.13

Issue #143 
Reviewers: @Husseny @linsara @nadineadel @MussabElDash