Initial tweaks to hookup to Jim's pusher