Climber changes. Still WIP.

Code review left us with some changes and improvements to make.