marked where I need new logic to fix the scramble bug!