ouch ... breaking interface changes huh, update everything to reference new sink module