Overhaul to climb logic

^