Step 1 values assessment refactor
Refactored step 3 of values assessment
Finished updates on values assessment
Merge branch 'feature/Refactor_Values_Assessment' into develop
Merge branch 'develop'

* develop:
  Finished updates on values assessment
  Refactored step 3 of values assessment
  Step 1 values assessment refactor