Have scratch option working correctly at this point