Added winch, refactored