Wescott master exercise work

@jbau Fix for #1890