Add Shift, test more. It drives!