Refactored, refined contract, added wacthes gauge, custom mixin example