diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 28f25e0..5ab980f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,5 +53,6 @@ dependencies {
 
 //    implementation("com.github.yuriy-budiyev:code-scanner:2.3.0")
 //    implementation("com.github.kenglxn.QRGen:android:3.0.1")
-    implementation("com.journeyapps:zxing-android-embedded:2.3.0")
+//    implementation("com.journeyapps:zxing-android-embedded:2.3.0")
+    implementation("com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.3")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/RequestTask.java b/app/src/main/java/com/astatin3/scoutingapp2025/RequestTask.java
index cc1d95b..3db6682 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/RequestTask.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/RequestTask.java
@@ -1,6 +1,13 @@
 package com.astatin3.scoutingapp2025;
 
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PointF;
 import android.os.AsyncTask;
+import android.util.AttributeSet;
+import android.view.View;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/qrPointsOverlayView.java b/app/src/main/java/com/astatin3/scoutingapp2025/qrPointsOverlayView.java
new file mode 100644
index 0000000..6d4e733
--- /dev/null
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/qrPointsOverlayView.java
@@ -0,0 +1,53 @@
+package com.astatin3.scoutingapp2025;
+
+// From https://github.com/dlazaro66/QRCodeReaderView/blob/master/samples/src/main/java/com/example/qr_readerexample/PointsOverlayView.java
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PointF;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class qrPointsOverlayView extends View {
+
+        PointF[] points;
+        private Paint paint;
+
+        public qrPointsOverlayView(Context context) {
+            super(context);
+            init();
+        }
+
+        public qrPointsOverlayView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            init();
+        }
+
+        public qrPointsOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
+            super(context, attrs, defStyleAttr);
+            init();
+        }
+
+        private void init() {
+            paint = new Paint();
+            paint.setColor(Color.YELLOW);
+            paint.setStyle(Paint.Style.FILL);
+        }
+
+        public void setPoints(PointF[] points) {
+            this.points = points;
+            invalidate();
+        }
+
+        @Override
+        public void draw(Canvas canvas) {
+            super.draw(canvas);
+            if (points != null) {
+                for (PointF pointF : points) {
+                    canvas.drawCircle(pointF.x, pointF.y, 10, paint);
+                }
+            }
+        }
+}
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java
index 67899ec..96d53b3 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java
@@ -44,239 +44,18 @@ public class TBAFragment extends Fragment {
         alert.create().show();
     }
 
-//    abstract class TBATask extends RequestTask {
-//        public static void run(String... uri){
-//            super.execute(uri);
-//        }
-//        private void response(String result){
-//            alert("data", result);
-//        }
-//    }
+
 
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-//        TBAViewModel dashboardViewModel =
-//                new ViewModelProvider(this).get(TBAViewModel.class);
 
         binding = FragmentTbaBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
-        ScrollArea = binding.ScrollArea;
-        Table = binding.matchTable;
-
-        warnPopup();
-
         return root;
     }
 
-    public void warnPopup() {
-
-//        alert("App Title", "This is an alert with no consequence");
-//
-        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-        alert.setMessage("This is an alert with no consequence");
-        alert.setTitle("App Title");
-        alert.setCancelable(true);
-
-        alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                final RequestTask rq = new RequestTask();
-                rq.onResult(new Function<String, String>() {
-                    @Override
-                    public String apply(String s) {
-                        eventTable(s);
-                        return null;
-                    }
-                });
-                rq.execute(TBAAddress + "events/2024", TBAHeader);
-            }
-        });
-
-        alert.create().show();
-    }
-
-    private void addTableText(TableRow tr, String textStr){
-        TextView text = new TextView(getContext());
-        text.setTextSize(18);
-        text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
-        text.setText(textStr);
-        tr.addView(text);
-    }
-
-    public void eventTable(String dataString){
-        try {
-            JSONArray data = new JSONArray(dataString);
-
-            Table.setStretchAllColumns(true);
-            Table.bringToFront();
-
-            boolean toggle = false;
-
-            TableRow tr = new TableRow(getContext());
-            addTableText(tr, "Key");
-            addTableText(tr, "Title");
-            addTableText(tr, "Type");
-
-            Table.addView(tr);
-
-            for(int i=0;i<data.length();i++){
-                tr = new TableRow(getContext());
-
-                if (toggle) {
-                    tr.setBackgroundColor(0x30000000);
-                }
-
-                JSONObject j = data.getJSONObject(i);
-
-                Button button = new Button(getContext());
-                String matchKey = j.getString("key");
-                button.setOnClickListener( new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        final RequestTask rq = new RequestTask();
-                        rq.onResult(new Function<String, String>() {
-                            @Override
-                            public String apply(String s) {
-                                matchTable(s);
-                                return null;
-                            }
-                        });
-                        rq.execute((TBAAddress + "event/" + matchKey + "/matches"), TBAHeader);
-                    }
-                });
-                button.setText(matchKey);
-                tr.addView(button);
-
-                String name = j.getString("short_name");
-
-                // Sometimes, a short name is not present on TBA Events
-                if(name.isEmpty()){
-                    name = j.getString("name");
-                }
-
-                addTableText(tr, name);
-                addTableText(tr, j.getString("event_type_string"));
-
-//                tr.addView(text);
-                Table.addView(tr);
-
-                toggle = !toggle;
-            }
-        }catch (JSONException j){
-            alert("Error", "Invalid JSON");
-        }
-    }
-
-    class matchComparator implements Comparator<JSONObject>
-    {
-
-        public int compare(JSONObject a, JSONObject b)
-        {
-            try {
-                return a.getInt("match_number") - b.getInt("match_number");
-            }catch (JSONException j){
-                return 0;
-            }
-        }
-    }
-
-
-    public void matchTable(String dataString){
-        try {
-            JSONArray data = new JSONArray(dataString);
-
-            Table.removeAllViews();
-            Table.setStretchAllColumns(true);
-            Table.bringToFront();
-
-
-
-            if(data.length() == 0){
-                TableRow tr = new TableRow(getContext());
-                addTableText(tr, "This event has no matches released yet...");
-                Table.addView(tr);
-                tr = new TableRow(getContext());
-                addTableText(tr, "Try manually adding practice matches.");
-                Table.addView(tr);
-                return;
-            }
-
-
-            TableRow tr = new TableRow(getContext());
-            addTableText(tr, "#");
-            addTableText(tr, "Red-1");
-            addTableText(tr, "Red-2");
-            addTableText(tr, "Red-3");
-            addTableText(tr, "Blue-1");
-            addTableText(tr, "Blue-2");
-            addTableText(tr, "Blue-3");
-            Table.addView(tr);
-
-
-            data = JSONUtil.sort(data, new Comparator(){
-                public int compare(Object a, Object b){
-                    JSONObject    ja = (JSONObject)a;
-                    JSONObject    jb = (JSONObject)b;
-                    try {
-                        return ja.getInt("match_number") - jb.getInt("match_number");
-                    }catch (JSONException j){
-                        return 0;
-                    }
-                }
-            });
-
-
-            boolean toggle = false;
-            int matchCount = 1;
-
-            for(int a=0;a<data.length();a++){
-                final JSONObject match = data.getJSONObject(a);
-
-                if(!match.getString("comp_level").equals("qm")){
-                    continue;
-                }
-
-                final JSONObject alliances = match.getJSONObject("alliances");
-                final JSONArray redAlliance = alliances.getJSONObject("red").getJSONArray("team_keys");
-                final JSONArray blueAlliance = alliances.getJSONObject("blue").getJSONArray("team_keys");
-
-                tr = new TableRow(getContext());
-
-                if (toggle) {
-                    tr.setBackgroundColor(0x30000000);
-                }
-
-                addTableText(tr, String.valueOf(matchCount));
-//                addTableText(tr, match.getString("key"));
-
-                for(int b=0;b<6;b++){
-                    TextView text = new TextView(getContext());
-                    text.setTextSize(18);
-                    text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
-                    tr.addView(text);
-
-                    if(b < 3){
-                        text.setText(redAlliance.getString(b).substring(3));
-                        text.setBackgroundColor(0x50ff0000);
-                    }else{
-                        text.setText(blueAlliance.getString(b-3).substring(3));
-                        text.setBackgroundColor(0x500000ff);
-                    }
-                }
-
-                Table.addView(tr);
-
-                matchCount += 1;
-                toggle = !toggle;
-            }
-
-
-
-        }catch (JSONException j){
-            alert("Error", "Invalid JSON");
-        }
-    }
 
     @Override
     public void onDestroyView() {
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/home/HomeFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/home/HomeFragment.java
index 4ae8ea2..24d58cc 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/home/HomeFragment.java
@@ -1,198 +1,26 @@
 package com.astatin3.scoutingapp2025.ui.home;
 
-import android.app.AlertDialog;
-import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.os.CountDownTimer;
 import android.view.LayoutInflater;
 
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.SeekBar;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.astatin3.scoutingapp2025.databinding.FragmentHomeBinding;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.Map;
-
 
 public class HomeFragment extends Fragment {
 
     private FragmentHomeBinding binding;
 
-    private final int maxQrCount = 256; //The max number that can be stored in a byte
-
-    private final int maxQrSpeed = 20;
-    private final int minQrSpeed = 300 + maxQrSpeed - 1;
-
-    private int minQrSize = 0;
-    private final int maxQrSize = 600;
-    private int qrSize = 100;
-
-
-    private int curCodeIndex = 0;
-    private final int defaultQrDelay = 419;
-    private int qrDelay = 0;
-    private int qrIndex = 0;
-
-    private CountDownTimer timer;
-    private int qrCount = 0;
-
-    private ArrayList<Bitmap> qrBitmaps;
-
-    private void alert(String title, String content) {
-        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-        alert.setMessage(content);
-        alert.setTitle(title);
-        alert.setPositiveButton("OK", null);
-        alert.setCancelable(true);
-        alert.create().show();
-    }
-
-    public static Bitmap generateQrCode(String myCodeText) throws WriterException {
-//        Hashtable<EncodeHintType, ErrorCorrectionLevel> hintMap = new Hashtable<EncodeHintType, ErrorCorrectionLevel>();
-
-        QRCodeWriter qrCodeWriter = new QRCodeWriter();
-
-        Map<EncodeHintType, Object> hints = new EnumMap<EncodeHintType, Object>(EncodeHintType.class);
-        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
-        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L); // H = 30% damage
-        hints.put(EncodeHintType.QR_COMPACT, true);
-        hints.put(EncodeHintType.MARGIN, 0); /* default = 4 */
-
-        int size = 200;
-
-        BitMatrix bitMatrix = qrCodeWriter.encode(myCodeText, BarcodeFormat.QR_CODE, size, size, hints);
-
-        int width = bitMatrix.getWidth();
-        int height = bitMatrix.getHeight();
-
-        int[] pixels = new int[width * height];
-        for (int y = 0; y < height; y++) {
-            int offset = y * width;
-            for (int x = 0; x < width; x++) {
-               pixels[offset + x] = bitMatrix.get(x, y) ? Color.BLACK : Color.WHITE;
-            }
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
-
-        return bitmap;
-    }
-
-
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
 
         binding = FragmentHomeBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
-
-//        binding.qrSizeSlider.setProgress(qrSize);
-
-        sendData("Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism,Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism");
-
         return root;
     }
-
-    private void sendData(String data){
-        minQrSize = Math.round(maxQrCount/data.length());
-
-        binding.qrSizeSlider.setMax(maxQrSize-minQrSize);
-        binding.qrSpeedSlider.setMax((minQrSpeed-maxQrSpeed)*2);
-
-        binding.qrSpeedSlider.setProgress(defaultQrDelay);
-
-        qrCount = (data.length()/qrSize)+1;
-        binding.qrIndexD.setText(String.valueOf(qrCount));
-
-//        alert("size", ""+binding.qrSizeSlider.getProgress()+"\n"+binding.qrSizeSlider.getMax());
-
-        binding.qrSpeedSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                qrDelay = -(minQrSpeed - progress - maxQrSpeed + 1);
-            }
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {}
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {}
-        });
-
-        binding.qrSizeSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {}
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {}
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                qrSize = seekBar.getProgress() + minQrSpeed;
-                qrCount = (data.length()/qrSize)+1;
-                binding.qrIndexD.setText(String.valueOf(qrCount));
-                sendData(data);
-            }
-        });
-
-        qrBitmaps = new ArrayList<Bitmap>();
-        for(int i=0;i<=(data.length()/qrSize);i++){
-            final int start = i*qrSize;
-            int end = (i+1)*qrSize;
-            if(end > data.length()){
-                end = data.length()-1;
-            }
-            try {
-                qrBitmaps.add(generateQrCode(
-                    data.substring(start, end)
-                ));
-            }catch (WriterException e){
-                e.printStackTrace();
-            }
-        }
-        qrIndex = 0;
-        if(timer != null){
-            timer.cancel();
-        }
-        qrLoop();
-    }
-
-    private void updateQr(){
-        binding.qrImage.setImageBitmap(qrBitmaps.get(qrIndex));
-        if(qrDelay > 0) {
-            this.qrIndex += 1;
-            if (this.qrIndex >= this.qrCount) {
-                this.qrIndex = 0;
-            }
-        }else{
-            this.qrIndex -= 1;
-            if (this.qrIndex < 0) {
-                this.qrIndex = this.qrCount-1;
-            }
-        }
-        binding.qrIndexN.setText(String.valueOf(qrIndex+1));
-    }
-
-    private void qrLoop(){
-        timer = new CountDownTimer(minQrSpeed-Math.abs(qrDelay)+1, 1000) {
-            public void onTick(long millisUntilFinished) {}
-            public void onFinish() {
-                updateQr();
-                qrLoop();
-            }
-        }.start();
-
-
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/notifications/NotificationsFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/notifications/NotificationsFragment.java
deleted file mode 100644
index b456ece..0000000
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/notifications/NotificationsFragment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.notifications;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.R;
-import com.budiyev.android.codescanner.CodeScanner;
-import com.budiyev.android.codescanner.CodeScannerView;
-import com.budiyev.android.codescanner.DecodeCallback;
-import com.budiyev.android.codescanner.ScanMode;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.Result;
-
-import java.util.EnumMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-public class NotificationsFragment extends Fragment {
-    private CodeScanner mCodeScanner;
-
-
-    private void alert(String title, String content) {
-        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-        alert.setMessage(content);
-        alert.setTitle(title);
-        alert.setPositiveButton("OK", null);
-        alert.setCancelable(true);
-        alert.create().show();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        final Activity activity = getActivity();
-        View root = inflater.inflate(R.layout.fragment_notifications, container, false);
-
-        IntentIntegrator integrator = IntentIntegrator.forSupportFragment(FragmentQRScan.this);
-
-        integrator.setOrientationLocked(false);
-        integrator.setPrompt("Scan QR code");
-        integrator.setBeepEnabled(false);
-        integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE);
-
-
-        integrator.initiateScan();
-
-        return root;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java
new file mode 100644
index 0000000..da83c65
--- /dev/null
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java
@@ -0,0 +1,254 @@
+package com.astatin3.scoutingapp2025.ui.transfer;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ScrollView;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.astatin3.scoutingapp2025.R;
+import com.astatin3.scoutingapp2025.RequestTask;
+import com.astatin3.scoutingapp2025.databinding.FragmentTbaBinding;
+import com.astatin3.scoutingapp2025.databinding.FragmentTransferBinding;
+import com.astatin3.scoutingapp2025.ui.JSONUtil;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Comparator;
+import java.util.function.Function;
+
+public class TBAView extends ScrollView {
+
+    //    private final String
+    private final String TBAAddress = "https://www.thebluealliance.com/api/v3/";
+    private final String TBAHeader = "X-TBA-Auth-Key: tjEKSZojAU2pgbs2mBt06SKyOakVhLutj3NwuxLTxPKQPLih11aCIwRIVFXKzY4e";
+
+    private android.widget.TableLayout Table;
+
+    public TBAView(Context context) {
+        super(context);
+    }
+
+    public TBAView(Context context, AttributeSet attributeSet){
+        super(context, attributeSet);
+    }
+
+    private void alert(String title, String content) {
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        alert.setMessage(content);
+        alert.setTitle(title);
+        alert.setPositiveButton("OK", null);
+        alert.setCancelable(true);
+        alert.create().show();
+    }
+
+
+    public void start(FragmentTransferBinding binding, String yearStr) {
+
+        Table = binding.matchTable;
+
+        final RequestTask rq = new RequestTask();
+        rq.onResult(new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                eventTable(s);
+                return null;
+            }
+        });
+        rq.execute(TBAAddress + "events/"+yearStr, TBAHeader);
+
+    }
+
+    private void addTableText(TableRow tr, String textStr){
+        TextView text = new TextView(getContext());
+        text.setTextSize(18);
+        text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
+        text.setText(textStr);
+        tr.addView(text);
+    }
+
+    public void eventTable(String dataString){
+        try {
+            JSONArray data = new JSONArray(dataString);
+
+            Table.setStretchAllColumns(true);
+            Table.bringToFront();
+
+            boolean toggle = false;
+
+            TableRow tr = new TableRow(getContext());
+            addTableText(tr, "Key");
+            addTableText(tr, "Title");
+            addTableText(tr, "Type");
+
+            Table.addView(tr);
+
+            for(int i=0;i<data.length();i++){
+                tr = new TableRow(getContext());
+
+                if (toggle) {
+                    tr.setBackgroundColor(0x30000000);
+                }
+
+                JSONObject j = data.getJSONObject(i);
+
+                Button button = new Button(getContext());
+                String matchKey = j.getString("key");
+                button.setOnClickListener( new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        final RequestTask rq = new RequestTask();
+                        rq.onResult(new Function<String, String>() {
+                            @Override
+                            public String apply(String s) {
+                                matchTable(s);
+                                return null;
+                            }
+                        });
+                        rq.execute((TBAAddress + "event/" + matchKey + "/matches"), TBAHeader);
+                    }
+                });
+                button.setText(matchKey);
+                tr.addView(button);
+
+                String name = j.getString("short_name");
+
+                // Sometimes, a short name is not present on TBA Events
+                if(name.isEmpty()){
+                    name = j.getString("name");
+                }
+
+                addTableText(tr, name);
+                addTableText(tr, j.getString("event_type_string"));
+
+//                tr.addView(text);
+                Table.addView(tr);
+
+                toggle = !toggle;
+            }
+        }catch (JSONException j){
+            alert("Error", "Invalid JSON");
+        }
+    }
+
+    class matchComparator implements Comparator<JSONObject>
+    {
+
+        public int compare(JSONObject a, JSONObject b)
+        {
+            try {
+                return a.getInt("match_number") - b.getInt("match_number");
+            }catch (JSONException j){
+                return 0;
+            }
+        }
+    }
+
+
+    public void matchTable(String dataString){
+        try {
+            JSONArray data = new JSONArray(dataString);
+
+            Table.removeAllViews();
+            Table.setStretchAllColumns(true);
+            Table.bringToFront();
+
+
+
+            if(data.length() == 0){
+                TableRow tr = new TableRow(getContext());
+                addTableText(tr, "This event has no matches released yet...");
+                Table.addView(tr);
+                tr = new TableRow(getContext());
+                addTableText(tr, "Try manually adding practice matches.");
+                Table.addView(tr);
+                return;
+            }
+
+
+            TableRow tr = new TableRow(getContext());
+            addTableText(tr, "#");
+            addTableText(tr, "Red-1");
+            addTableText(tr, "Red-2");
+            addTableText(tr, "Red-3");
+            addTableText(tr, "Blue-1");
+            addTableText(tr, "Blue-2");
+            addTableText(tr, "Blue-3");
+            Table.addView(tr);
+
+
+            data = JSONUtil.sort(data, new Comparator(){
+                public int compare(Object a, Object b){
+                    JSONObject    ja = (JSONObject)a;
+                    JSONObject    jb = (JSONObject)b;
+                    try {
+                        return ja.getInt("match_number") - jb.getInt("match_number");
+                    }catch (JSONException j){
+                        return 0;
+                    }
+                }
+            });
+
+
+            boolean toggle = false;
+            int matchCount = 1;
+
+            for(int a=0;a<data.length();a++){
+                final JSONObject match = data.getJSONObject(a);
+
+                if(!match.getString("comp_level").equals("qm")){
+                    continue;
+                }
+
+                final JSONObject alliances = match.getJSONObject("alliances");
+                final JSONArray redAlliance = alliances.getJSONObject("red").getJSONArray("team_keys");
+                final JSONArray blueAlliance = alliances.getJSONObject("blue").getJSONArray("team_keys");
+
+                tr = new TableRow(getContext());
+
+                if (toggle) {
+                    tr.setBackgroundColor(0x30000000);
+                }
+
+                addTableText(tr, String.valueOf(matchCount));
+//                addTableText(tr, match.getString("key"));
+
+                for(int b=0;b<6;b++){
+                    TextView text = new TextView(getContext());
+                    text.setTextSize(18);
+                    text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
+                    tr.addView(text);
+
+                    if(b < 3){
+                        text.setText(redAlliance.getString(b).substring(3));
+                        text.setBackgroundColor(0x50ff0000);
+                    }else{
+                        text.setText(blueAlliance.getString(b-3).substring(3));
+                        text.setBackgroundColor(0x500000ff);
+                    }
+                }
+
+                Table.addView(tr);
+
+                matchCount += 1;
+                toggle = !toggle;
+            }
+
+
+
+        }catch (JSONException j){
+            alert("Error", "Invalid JSON");
+        }
+    }
+}
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java
new file mode 100644
index 0000000..04cc447
--- /dev/null
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java
@@ -0,0 +1,80 @@
+package com.astatin3.scoutingapp2025.ui.transfer;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.astatin3.scoutingapp2025.RequestTask;
+import com.astatin3.scoutingapp2025.databinding.FragmentTransferBinding;
+
+import java.util.function.Function;
+
+public class TransferFragment extends Fragment {
+    private FragmentTransferBinding binding;
+
+
+    private void alert(String title, String content) {
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        alert.setMessage(content);
+        alert.setTitle(title);
+        alert.setPositiveButton("OK", null);
+        alert.setCancelable(true);
+        alert.create().show();
+    }
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+
+
+        binding = FragmentTransferBinding.inflate(inflater, container, false);
+        View root = binding.getRoot();
+
+        binding.uploadButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                binding.selectLayout.setVisibility(View.GONE);
+                binding.generatorLayout.setVisibility(View.VISIBLE);
+                binding.generatorLayout.start(binding, "Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism,Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmentarianismDisestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, DisestablishmenjAWHRJGQWEhugQWHKJEtarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism, Disestablishmentarianism");
+            }
+        });
+
+        binding.downloadButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                binding.selectLayout.setVisibility(View.GONE);
+                binding.scannerLayout.setVisibility(View.VISIBLE);
+                binding.scannerLayout.start(binding);
+            }
+        });
+        binding.TBAButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+                alert.setTitle("Warning");
+                alert.setMessage("This action requires internet.");
+                alert.setCancelable(true);
+
+                alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        binding.selectLayout.setVisibility(View.GONE);
+                        binding.TBAView.setVisibility(View.VISIBLE);
+                        binding.TBAView.start(binding, "2024");
+                    }
+                });
+
+                alert.setNegativeButton("Cancel", null);
+                alert.create().show();
+            }
+        });
+
+        return root;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java
new file mode 100644
index 0000000..007f390
--- /dev/null
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java
@@ -0,0 +1,188 @@
+package com.astatin3.scoutingapp2025.ui.transfer;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.CountDownTimer;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.astatin3.scoutingapp2025.R;
+import com.astatin3.scoutingapp2025.databinding.FragmentTransferBinding;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.Map;
+
+public class generatorView extends ConstraintLayout {
+    private FragmentTransferBinding binding;
+    private ImageView qrImage;
+    private SeekBar qrSpeedSlider;
+    private SeekBar qrSizeSlider;
+    private TextView qrIndexN;
+    private TextView qrIndexD;
+
+    private final int maxQrCount = 256; //The max number that can be stored in a byte
+
+    private final int maxQrSpeed = 20;
+    private final int minQrSpeed = 300 + maxQrSpeed - 1;
+
+    private int minQrSize = 0;
+    private final int maxQrSize = 600;
+    private int qrSize = 200;
+
+
+    private int curCodeIndex = 0;
+    private final int defaultQrDelay = 419;
+    private int qrDelay = 0;
+    private int qrIndex = 0;
+
+    private CountDownTimer timer;
+    private int qrCount = 0;
+
+    private ArrayList<Bitmap> qrBitmaps;
+    public generatorView(Context context) {
+        super(context);
+    }
+
+    public generatorView(Context context, AttributeSet attributeSet){
+        super(context, attributeSet);
+    }
+
+    public static Bitmap generateQrCode(String myCodeText) throws WriterException {
+
+        QRCodeWriter qrCodeWriter = new QRCodeWriter();
+
+        Map<EncodeHintType, Object> hints = new EnumMap<EncodeHintType, Object>(EncodeHintType.class);
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L); // H = 30% damage
+//        hints.put(EncodeHintType.QR_COMPACT, true);
+        hints.put(EncodeHintType.MARGIN, 0); /* default = 4 */
+
+        int size = 200;
+
+        BitMatrix bitMatrix = qrCodeWriter.encode(myCodeText, BarcodeFormat.QR_CODE, size, size, hints);
+
+        int width = bitMatrix.getWidth();
+        int height = bitMatrix.getHeight();
+
+        int[] pixels = new int[width * height];
+        for (int y = 0; y < height; y++) {
+            int offset = y * width;
+            for (int x = 0; x < width; x++) {
+                pixels[offset + x] = bitMatrix.get(x, y) ? Color.BLACK : Color.WHITE;
+            }
+        }
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+
+        return bitmap;
+    }
+
+    public void start(FragmentTransferBinding binding, String data){
+        qrImage = binding.qrImage;
+        qrSpeedSlider = binding.qrSpeedSlider;
+        qrSizeSlider = binding.qrSizeSlider;
+        qrIndexN = binding.qrIndexN;
+        qrIndexD = binding.qrIndexD;
+
+        sendData(data);
+    }
+
+    private void sendData(String data){
+        minQrSize = Math.round(data.length()/maxQrCount);
+
+        qrSizeSlider.setMax(maxQrSize-minQrSize);
+        qrSpeedSlider.setMax((minQrSpeed-maxQrSpeed)*2);
+
+        qrCount = (data.length()/qrSize)+1;
+        qrIndexD.setText(String.valueOf(qrCount));
+
+//        alert("size", ""+binding.qrSizeSlider.getProgress()+"\n"+binding.qrSizeSlider.getMax());
+
+        qrSpeedSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                qrDelay = -(minQrSpeed - progress - maxQrSpeed + 1);
+            }
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {}
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {}
+        });
+
+        qrSizeSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {}
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {}
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                qrSize = seekBar.getProgress() + minQrSpeed;
+                qrCount = (data.length()/qrSize)+1;
+                qrIndexD.setText(String.valueOf(qrCount));
+                sendData(data);
+            }
+        });
+
+        qrSpeedSlider.setProgress(defaultQrDelay+5);
+
+        qrBitmaps = new ArrayList<Bitmap>();
+        for(int i=0;i<=(data.length()/qrSize);i++){
+            final int start = i*qrSize;
+            int end = (i+1)*qrSize;
+            if(end > data.length()){
+                end = data.length()-1;
+            }
+            try {
+                qrBitmaps.add(generateQrCode(
+                        data.substring(start, end)
+                ));
+            }catch (WriterException e){
+                e.printStackTrace();
+            }
+        }
+        qrIndex = 0;
+        if(timer != null){
+            timer.cancel();
+        }
+        qrLoop();
+    }
+
+    private void updateQr(){
+        qrImage.setImageBitmap(qrBitmaps.get(qrIndex));
+        if(qrDelay > 0) {
+            this.qrIndex += 1;
+            if (this.qrIndex >= this.qrCount) {
+                this.qrIndex = 0;
+            }
+        }else{
+            this.qrIndex -= 1;
+            if (this.qrIndex < 0) {
+                this.qrIndex = this.qrCount-1;
+            }
+        }
+        qrIndexN.setText(String.valueOf(qrIndex+1));
+    }
+
+    private void qrLoop(){
+        timer = new CountDownTimer(minQrSpeed-Math.abs(qrDelay)+1, 1000) {
+            public void onTick(long millisUntilFinished) {}
+            public void onFinish() {
+                updateQr();
+                qrLoop();
+            }
+        }.start();
+    }
+}
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java
new file mode 100644
index 0000000..c8295ff
--- /dev/null
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java
@@ -0,0 +1,66 @@
+package com.astatin3.scoutingapp2025.ui.transfer;
+
+import android.app.ActionBar;
+import android.content.Context;
+import android.graphics.PointF;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.astatin3.scoutingapp2025.databinding.FragmentTransferBinding;
+import com.astatin3.scoutingapp2025.qrPointsOverlayView;
+import com.dlazaro66.qrcodereaderview.QRCodeReaderView;
+
+public class scannerView extends ConstraintLayout {
+    private QRCodeReaderView qrCodeReaderView;
+    private qrPointsOverlayView pointsOverlayView;
+
+    private class codeReadListener implements QRCodeReaderView.OnQRCodeReadListener {
+        @Override
+        public void onQRCodeRead(String text, PointF[] points) {
+            pointsOverlayView.setPoints(points);
+        }
+    }
+
+    public scannerView(Context context) {
+        super(context);
+    }
+
+    public scannerView(Context context, AttributeSet attributeSet){
+        super(context, attributeSet);
+    }
+
+    public void start(FragmentTransferBinding binding){
+        qrCodeReaderView = new QRCodeReaderView(getContext());
+        this.addView(qrCodeReaderView);
+        ConstraintLayout.LayoutParams qrCodeReaderViewParams = (ConstraintLayout.LayoutParams) qrCodeReaderView.getLayoutParams();
+        qrCodeReaderViewParams.width = ActionBar.LayoutParams.MATCH_PARENT;
+        qrCodeReaderViewParams.height = ActionBar.LayoutParams.MATCH_PARENT;
+        qrCodeReaderView.setLayoutParams(qrCodeReaderViewParams);
+
+        pointsOverlayView = new qrPointsOverlayView(getContext());
+        pointsOverlayView.bringToFront();
+        this.addView(pointsOverlayView);
+        ConstraintLayout.LayoutParams pointsOverlayViewParams = (ConstraintLayout.LayoutParams) qrCodeReaderView.getLayoutParams();
+        pointsOverlayViewParams.width = ActionBar.LayoutParams.MATCH_PARENT;
+        pointsOverlayViewParams.height = ActionBar.LayoutParams.MATCH_PARENT;
+        pointsOverlayView.setLayoutParams(pointsOverlayViewParams);
+
+
+        qrCodeReaderView.startCamera();
+
+//        qrCodeReaderView = (QRCodeReaderView) binding.qrdecoderview;
+        qrCodeReaderView.setOnQRCodeReadListener(new codeReadListener());
+//        qrCodeReaderView.setQRDecodingEnabled(true);
+        qrCodeReaderView.setAutofocusInterval(2000L);
+//        qrCodeReaderView.setFrontCamera();
+        qrCodeReaderView.setBackCamera();
+        qrCodeReaderView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                qrCodeReaderView.forceAutoFocus();
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/drawable/transfer_icon.xml b/app/src/main/res/drawable/transfer_icon.xml
new file mode 100644
index 0000000..115dfc1
--- /dev/null
+++ b/app/src/main/res/drawable/transfer_icon.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M19.5,16.5H6M5.5,8.5L19,8.5"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#121923"/>
+  <path
+      android:pathData="M16,13L19.5,16.5L16,20M9,12L5.5,8.5L9,5"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#121923"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 29fb527..dc993a5 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -10,84 +10,5 @@
     android:focusableInTouchMode="false"
     tools:context=".MainActivity">
 
-    <SeekBar
-        android:id="@+id/qrSizeSlider"
-        android:layout_width="412dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="34dp"
-        android:layout_marginBottom="60dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.971"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage"
-        app:layout_constraintVertical_bias="0.838" />
-
-    <SeekBar
-        android:id="@+id/qrSpeedSlider"
-        android:layout_width="412dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="34dp"
-        android:layout_marginBottom="60dp"
-        app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.971"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage"
-        app:layout_constraintVertical_bias="0.93" />
-
-    <ImageView
-        android:id="@+id/qrImage"
-        android:layout_width="300dp"
-        android:layout_height="300dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/qrSpeedText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:text="QR Speed"
-        app:layout_constraintBottom_toTopOf="@+id/qrSpeedSlider"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/qrSizeText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:text="QR Size"
-        app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/qrIndexSlash"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="202dp"
-        android:layout_marginEnd="203dp"
-        android:text="/"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
-
-    <TextView
-        android:id="@+id/qrIndexN"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="0"
-        app:layout_constraintEnd_toStartOf="@+id/qrIndexSlash"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
-
-    <TextView
-        android:id="@+id/qrIndexD"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="0"
-        app:layout_constraintStart_toEndOf="@+id/qrIndexSlash"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
deleted file mode 100644
index 8939324..0000000
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.notifications.NotificationsFragment">
-
-    <FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.budiyev.android.codescanner.CodeScannerView
-            android:id="@+id/scanner_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:autoFocusButtonColor="@android:color/white"
-            app:autoFocusButtonVisible="true"
-            app:flashButtonColor="@android:color/white"
-            app:flashButtonVisible="true"
-            app:frameColor="@android:color/white"
-            app:frameCornersSize="50dp"
-            app:frameCornersRadius="0dp"
-            app:frameAspectRatioWidth="1"
-            app:frameAspectRatioHeight="1"
-            app:frameSize="0.75"
-            app:frameThickness="2dp"
-            app:frameVerticalBias="0.5"
-            app:maskColor="#77000000"/>
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/app/src/main/res/layout/fragment_transfer.xml b/app/src/main/res/layout/fragment_transfer.xml
new file mode 100644
index 0000000..cccd728
--- /dev/null
+++ b/app/src/main/res/layout/fragment_transfer.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.transfer.TransferFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/selectLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <Button
+            android:id="@+id/uploadButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Upload"
+            android:textSize="34sp"
+            app:layout_constraintBottom_toTopOf="@+id/downloadButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/downloadButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Download"
+            android:textSize="34sp"
+            app:layout_constraintBottom_toBottomOf="@+id/TBAButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/uploadButton" />
+
+        <Button
+            android:id="@+id/TBAButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TBA"
+            android:textSize="34sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/downloadButton" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.astatin3.scoutingapp2025.ui.transfer.generatorView
+        android:id="@+id/generatorLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="gone">
+
+        <SeekBar
+            android:id="@+id/qrSizeSlider"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginBottom="60dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+
+        <SeekBar
+            android:id="@+id/qrSpeedSlider"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginBottom="60dp"
+            app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.971"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/qrImage"
+            app:layout_constraintVertical_bias="0.93" />
+
+        <ImageView
+            android:id="@+id/qrImage"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/qrSpeedText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="QR Speed"
+            app:layout_constraintBottom_toTopOf="@+id/qrSpeedSlider"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/qrSizeText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="QR Size"
+            app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/qrIndexN"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            app:layout_constraintEnd_toStartOf="@+id/qrIndexSlash"
+            app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+
+        <TextView
+            android:id="@+id/qrIndexSlash"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="/"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+
+        <TextView
+            android:id="@+id/qrIndexD"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            app:layout_constraintStart_toEndOf="@+id/qrIndexSlash"
+            app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+
+    </com.astatin3.scoutingapp2025.ui.transfer.generatorView>
+
+    <com.astatin3.scoutingapp2025.ui.transfer.scannerView
+        android:id="@+id/scannerLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="gone">
+
+        <com.astatin3.scoutingapp2025.qrPointsOverlayView
+            android:id="@+id/qrPointsOverlayView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </com.astatin3.scoutingapp2025.ui.transfer.scannerView>
+
+    <com.astatin3.scoutingapp2025.ui.transfer.TBAView
+        android:id="@+id/TBAView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="57dp"
+        android:fillViewport="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TableLayout
+                android:id="@+id/matchTable"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </LinearLayout>
+    </com.astatin3.scoutingapp2025.ui.transfer.TBAView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 8a0aee5..311834d 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -8,8 +8,8 @@
 
     <item
         android:id="@+id/navigation_notifications"
-        android:icon="@drawable/ic_notifications_black_24dp"
-        android:title="@string/title_notifications" />
+        android:icon="@drawable/transfer_icon"
+        android:title="@string/title_transfer" />
     <item
         android:id="@+id/navigation_tba"
         android:icon="@drawable/ic_dashboard_black_24dp"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 8acf355..7ec25d9 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -36,7 +36,7 @@
 
     <fragment
         android:id="@+id/navigation_notifications"
-        android:name="com.astatin3.scoutingapp2025.ui.notifications.NotificationsFragment"
-        android:label="@string/title_notifications"
-        tools:layout="@layout/fragment_notifications" />
+        android:name="com.astatin3.scoutingapp2025.ui.transfer.TransferFragment"
+        android:label="@string/title_transfer"
+        tools:layout="@layout/fragment_transfer" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ff9a85..bc2e1c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">ScoutingApp2025</string>
     <string name="title_home">Home</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="title_transfer">Transfer</string>
     <string name="title_tba">TBA</string>
 </resources>
\ No newline at end of file