Refactored One Param One Segment non build test
Refactored One Param One Segment non build test

grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation