diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index c5dca4c..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\youss\.android\avd\Pixel_2_API_30_2.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-11-09T18:35:37.146775700Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0bed1c8..a2d7c21 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/AndroidStudioProjects/AndroidAssignments/gradle-7.3.3" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdd9278..1b5710d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/activity_course_selection.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/activity_groupchat.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/activity_login.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/activity_main.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/activity_register.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/custom_dialog_edit_groupinfo.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/event_cell.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/fragment_appointment.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/fragment_book_appointment.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/fragment_create_group.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/fragment_group.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/group_list_view.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/groups_custom_dialog_box.xml" value="0.4" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/hour_cell.xml" value="0.275" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/message_from_person.xml" value="0.27395833333333336" />
+        <entry key="..\:/Users/ffdfd/OneDrive/Desktop/FinalProjAndroid/android/app/src/main/res/layout/message_from_user.xml" value="0.20546875" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 4376212..441bdc6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,10 +42,17 @@ dependencies {
     implementation 'com.koushikdutta.ion:ion:3.1.0'
     implementation 'com.google.firebase:firebase-auth:21.1.0'
     implementation 'com.google.firebase:firebase-firestore:24.4.0'
+    implementation 'com.google.firebase:firebase-messaging:23.1.0'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'org.jsoup:jsoup:1.15.3'
 
 
+    implementation 'com.google.firebase:firebase-inappmessaging-display:20.2.0'
+    implementation 'com.google.firebase:firebase-analytics:21.2.0'
+
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c16da1..5ce6df3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Android"
         tools:targetApi="31">
+
+
+
+        <activity
+            android:name=".Groupchat"
+            android:exported="false" />
         <activity
             android:name=".EventLayoutActivity"
             android:exported="false">
diff --git a/app/src/main/java/com/example/android/ClassFragment.java b/app/src/main/java/com/example/android/ClassFragment.java
index 72ea01c..29eeceb 100644
--- a/app/src/main/java/com/example/android/ClassFragment.java
+++ b/app/src/main/java/com/example/android/ClassFragment.java
@@ -1,12 +1,37 @@
 package com.example.android;
 
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.android.material.chip.Chip;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.FieldPath;
+import com.google.firebase.firestore.FieldValue;
+import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.QueryDocumentSnapshot;
+import com.google.firebase.firestore.QuerySnapshot;
+import com.google.firebase.firestore.auth.User;
+
+import java.util.ArrayList;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -14,11 +39,17 @@
  * create an instance of this fragment.
  */
 public class ClassFragment extends Fragment {
-    protected static final String FRAGMENT_NAME="ClassFragment";
+    protected static final String FRAGMENT_NAME="GroupFragment";
+    private final FirebaseFirestore db = FirebaseFirestore.getInstance();
+    protected static int[] colorIcon = {Color.RED, Color.GREEN, Color.BLUE, Color.YELLOW};
+    private  ViewClassAdpater adapter;
+    private final ArrayList<String> Studentclass = new ArrayList<String>();
+    private ListView Classlist;
+    TextView noclassinfo;
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
+    private static final String UserID  = "userID";
     private static final String ARG_PARAM2 = "param2";
 
     // TODO: Rename and change types of parameters
@@ -42,17 +73,65 @@ public ClassFragment() {
     public static ClassFragment newInstance(String param1, String param2) {
         ClassFragment fragment = new ClassFragment();
         Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
+        args.putString(UserID, param1);
         args.putString(ARG_PARAM2, param2);
         fragment.setArguments(args);
         return fragment;
     }
+    private class ViewClassAdpater extends ArrayAdapter<String> {
+        public ViewClassAdpater(@NonNull Context context, int resource) {
+            super(context, resource);
+        }
+
+        public int getCount() {
+            return Studentclass.size();
+        }
+
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = ClassFragment.this.getLayoutInflater();
+            View result = inflater.inflate(R.layout.group_list_view, null);
+            TextView message = result.findViewById(R.id.GroupNameLabel);
+            ImageView deleteButton = result.findViewById(R.id.RemoveGroup);
+            ImageView classIcon = result.findViewById(R.id.GroupIconDisplay);
+            TextView groupDescription = result.findViewById(R.id.GroupDescriptionLabel);
+            CardView cardGroup = result.findViewById(R.id.CardGroup);
+            ImageView EditIcon = result.findViewById(R.id.EditIcon);
+            EditIcon.setVisibility(View.INVISIBLE);
+
+
+
 
+
+            deleteButton.setTag(position);
+            classIcon.setTag(position);
+            cardGroup.setTag(position);
+
+            message.setText(Studentclass.get(position));
+            groupDescription.setText("Description of course");
+            classIcon.setImageResource(R.drawable.class_icon);
+            classIcon.setColorFilter((colorIcon[ (int)Math.floor(Math.random()*(colorIcon.length))]));
+
+            ImageView removeClassIV= result.findViewById(R.id.RemoveGroup);
+            removeClassIV.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    RemoveClass(view);
+                }
+            });
+
+
+
+            return result;
+        }
+
+    }
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
+            Log.i(FRAGMENT_NAME, "Bundle Received");
+            mParam1 = getArguments().getString(UserID);
             mParam2 = getArguments().getString(ARG_PARAM2);
         }
     }
@@ -61,6 +140,101 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_class, container, false);
+
+        Studentclass.clear();
+        View test=inflater.inflate(R.layout.fragment_group, container, false);
+        Classlist= test.findViewById(R.id.GroupinformationList);
+        TextView nogroupinfo = test.findViewById(R.id.NoGroupinfo);
+        TextView addclassBtn= test.findViewById(R.id.BannerText);
+        addclassBtn.setText("Add a class");
+        adapter = new ViewClassAdpater(this.getContext(), 0);
+        Classlist.setAdapter(adapter);
+        nogroupinfo.setText(R.string.noClassAdded);
+        nogroupinfo.setVisibility(View.INVISIBLE);
+        Classlist.setVisibility(View.VISIBLE);
+
+        CardView btn=test.findViewById(R.id.Banner);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getActivity().getSupportFragmentManager().beginTransaction()
+                        .replace(R.id.fragmentContainerView,CreateGroupFragment.class,getArguments()) //TODO: Change to Add Class Fragment
+                        .setReorderingAllowed(true)
+                        .addToBackStack("tempBackStack")
+                        .commit();
+            }
+        });
+
+        Log.i(FRAGMENT_NAME, "This is the param "+ mParam1);
+if (mParam1!=null) {
+    db.collection("user").whereEqualTo(FieldPath.documentId(), mParam1)  // ERR; Main activity is not passing the dat
+            .get()
+            .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
+                @Override
+                public void onComplete(@NonNull Task<QuerySnapshot> task) {
+                    if (task.isSuccessful()) {
+                        for (QueryDocumentSnapshot document : task.getResult()) {
+                            DisplayRegClasses((ArrayList<String>) document.get("courses"));
+                        }
+                    } else {
+                        Log.w(FRAGMENT_NAME, "Error getting documents.", task.getException());
+                    }
+                }
+            });
+}
+
+        return test;
+    }
+
+    public void DisplayRegClasses(ArrayList<String> studentClasses )
+    {
+
+        for (String course : studentClasses)
+        {
+            Studentclass.add(course);
+        }
+        Log.i(FRAGMENT_NAME, "Courses: " + Studentclass.size());
+        adapter.notifyDataSetChanged();
     }
+
+
+    public void RemoveClass(View view )
+    {
+        int positionitemToDelete = (int) view.getTag();
+        String coursename = Studentclass.get(positionitemToDelete);
+
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(this.getContext());
+
+        builder.setTitle("Are you sure you want to be removed from:" +  coursename);
+        builder.setPositiveButton(R.string.Yes,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        Studentclass.remove(positionitemToDelete);
+                        adapter.notifyDataSetChanged();
+                        if (Studentclass.size() == 0 )
+                        {
+
+
+                            noclassinfo.setVisibility(View.VISIBLE);
+                            Classlist.setVisibility(View.INVISIBLE);
+                        }
+                        deletefromdatabase(coursename, mParam1 );
+                    } });
+        builder.setNegativeButton("Cancel",
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                    } });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+
+    public void deletefromdatabase(String coursename, String userID )
+    {
+        DocumentReference groupsRef = db.collection("user").document(userID);
+        groupsRef.update("courses", FieldValue.arrayRemove(coursename));
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/Classes.java b/app/src/main/java/com/example/android/Classes.java
new file mode 100644
index 0000000..2d06ddd
--- /dev/null
+++ b/app/src/main/java/com/example/android/Classes.java
@@ -0,0 +1,20 @@
+package com.example.android;
+
+import java.util.ArrayList;
+
+public class Classes {
+
+    ArrayList<String> coursenames;
+
+    public Classes(ArrayList<String> coursename)
+    {
+
+        this.coursenames = coursename;
+
+    }
+
+    public ArrayList<String> getCoursename() {
+        return coursenames;
+    }
+
+}
diff --git a/app/src/main/java/com/example/android/CreateGroupFragment.java b/app/src/main/java/com/example/android/CreateGroupFragment.java
index aab71e1..82c275d 100644
--- a/app/src/main/java/com/example/android/CreateGroupFragment.java
+++ b/app/src/main/java/com/example/android/CreateGroupFragment.java
@@ -15,21 +15,32 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.DocumentSnapshot;
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.QueryDocumentSnapshot;
+import com.google.firebase.firestore.QuerySnapshot;
+import com.google.firebase.firestore.auth.User;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -41,30 +52,34 @@
 public class CreateGroupFragment extends Fragment {
 
     protected static final String FRAGMENT_NAME="CreateGroupFragment";
-
-
     protected FirebaseFirestore db = FirebaseFirestore.getInstance();
-    protected static final int MAXIMUM = 3;
+    protected static final int MAXIMUM = 4;
     protected Spinner StudentSpinner;
     protected Spinner CourseSpinner;
     protected Button AddButton;
     protected LinearProgressIndicator ProgressIndicator;
     protected EditText GroupNameInput;
     protected EditText GroupDescInput;
+    protected  ArrayList<String> memberEmails = new ArrayList<>();
+    protected  ArrayList<String> memberIds = new ArrayList<>();
 
+    protected  ArrayList<String> finalmemberEmails = new ArrayList<>();
+    protected  ArrayList<String> finalmemberIds = new ArrayList<>();
     protected static RecyclerViewAdapter_AddStudent addstudentadapter;
-    protected ArrayAdapter<CharSequence> adapter;
+    protected static ArrayAdapter<CharSequence> adapter;
     protected  ArrayAdapter<CharSequence> adapter2;
     protected RecyclerView StudentList;
     public static  ArrayList<String> user = new ArrayList<String >();
+    public ArrayList<String> courses = new ArrayList<>();
+    public static ArrayList<String> students = new ArrayList<>();
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM1 = "userID";
     private static final String ARG_PARAM2 = "param2";
 
     // TODO: Rename and change types of parameters
-    private String mParam1;
+    private String UserId;
     private String mParam2;
 
     public CreateGroupFragment() {
@@ -93,7 +108,7 @@ public static CreateGroupFragment newInstance(String param1, String param2) {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
+            UserId = getArguments().getString(ARG_PARAM1);
             mParam2 = getArguments().getString(ARG_PARAM2);
         }
     }
@@ -103,7 +118,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View inflated_view=inflater.inflate(R.layout.fragment_create_group, container, false);
 
-//        Chip chip=inflated_view.findViewById(R.id.AddGroup);
 
 
 
@@ -112,24 +126,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         AddButton = inflated_view.findViewById(R.id.AddButton);
         StudentList = inflated_view.findViewById(R.id.UsersAdd);
         addstudentadapter = new RecyclerViewAdapter_AddStudent(this.getContext(),user );
-        ProgressIndicator = inflated_view.findViewById(R.id.ProgressIndicator);
+//        ProgressIndicator = inflated_view.findViewById(R.id.ProgressIndicator);
         GroupNameInput = inflated_view.findViewById(R.id.TextGroupName);
         GroupDescInput = inflated_view.findViewById(R.id.GroupDescInput);
 
 
 
-        adapter = ArrayAdapter.createFromResource(this.getContext(), R.array.sudent_list, android.R.layout.simple_spinner_item );
-        adapter2 = ArrayAdapter.createFromResource(this.getContext(), R.array.courses_list, android.R.layout.simple_spinner_item );
+
+        adapter  = new ArrayAdapter(getContext(),  android.R.layout.simple_spinner_item, students);
         adapter.setDropDownViewResource(android.R.layout.simple_selectable_list_item);
+        StudentSpinner.setAdapter(adapter);
+
+        adapter2 = new ArrayAdapter(getContext(),  android.R.layout.simple_spinner_item, courses );
         adapter2.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        ProgressIndicator.setIndeterminate(false);
+        CourseSpinner.setAdapter(adapter2);
+
+//        ProgressIndicator.setIndeterminate(false);
 
         StudentList.setAdapter(addstudentadapter);
         StudentList.setLayoutManager(new LinearLayoutManager(this.getContext(), LinearLayoutManager.HORIZONTAL, false));
 
-        StudentSpinner.setAdapter(adapter);
-        CourseSpinner.setAdapter(adapter2);
-
+        PopulateFormDb(UserId);
         AddButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -137,6 +154,68 @@ public void onClick(View view) {
             }
         });
 
+        CourseSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                students.clear();
+
+              //  finalmemberEmails.clear();
+                memberIds.clear();
+                finalmemberIds.clear();
+                Log.i(FRAGMENT_NAME, " This is the final member size " + finalmemberIds.size());
+                memberIds.add("None");
+                students.add("None");
+                adapter.notifyDataSetChanged();
+                //Have to reset existing chipview data once user selects a diff item
+                boolean changed = false;
+                for (int j = 1; j<user.size(); j++)
+                {
+                    user.remove(j);
+                    changed = true;
+                }
+                if (changed) {
+                    addstudentadapter.notifyDataSetChanged();
+                }
+
+                db.collection("user")
+                        .whereArrayContains("courses", courses.get(i))
+                        .get()
+                        .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
+                            @Override
+                            public void onComplete(@NonNull Task<QuerySnapshot> task) {
+                                if (task.isSuccessful()) {
+                                    for (QueryDocumentSnapshot document : task.getResult()) {
+                                        String name = (String) document.get("first_name") + " " + document.getString("last_name");
+                                       // memberEmails.add((String) (document.get("email")));
+                                        if (!document.getId().equals(UserId))
+                                        {
+                                            memberIds.add(document.getId());
+
+                                        }
+                                        if (name.compareTo(user.get(0)) != 0 ) {
+                                            students.add(name);
+                                        }
+                                        adapter.notifyDataSetChanged();
+
+
+                                    }
+                                } else {
+                                    Log.d(FRAGMENT_NAME, "Error getting documents: ", task.getException());
+                                }
+                            }
+                        });
+
+
+
+
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
+
         Button saveFormbtn=inflated_view.findViewById(R.id.saveFormBtn);
         saveFormbtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -156,11 +235,23 @@ public void AddUser(View view ){
 
             if (spinner_position!=0) {
 
-                String selected_item = StudentSpinner.getItemAtPosition(spinner_position).toString();
-                Log.i(FRAGMENT_NAME, selected_item);
 
-                user.add(selected_item);
-                addstudentadapter.notifyItemInserted(user.size());
+
+                    String selected_item = StudentSpinner.getItemAtPosition(spinner_position).toString();
+                    Log.i(FRAGMENT_NAME, "This is the Spinner Position " + spinner_position);
+                    finalmemberIds.add(memberIds.get(spinner_position));
+
+                    user.add(selected_item);
+                    // finalmemberIds.add(UserId);
+                    Log.i(FRAGMENT_NAME, " THis is the member Id " + memberIds.get(spinner_position));
+                    // finalmemberEmails.add(memberEmails.get(spinner_position));
+
+                    students.remove(StudentSpinner.getSelectedItemPosition());
+                    memberIds.remove(spinner_position);
+                    adapter.notifyDataSetChanged();
+
+                    addstudentadapter.notifyDataSetChanged();
+
 
             }
 
@@ -175,14 +266,13 @@ public void AddUser(View view ){
     public void SaveForm(View view){
 
         if (!ValidateForm()) {
-            String message = "Err: Form is invalid, please make sure all fields are completed";
-            PrintSnackbar(message, Color.RED, Snackbar.LENGTH_LONG);
+            PrintSnackbar( R.string.FormErr, Color.RED, Snackbar.LENGTH_LONG);
         }
         else {
             WriteToDatabase();
         }
     }
-    private void PrintSnackbar(String message, int color, int duration)
+    private void PrintSnackbar(int message, int color, int duration)
     {
         Snackbar snackbar = Snackbar.make(this.getActivity().findViewById(R.id.linearLayout), message, duration)
                 .setAction("Action", null);
@@ -194,8 +284,7 @@ private boolean ValidateForm(){
         if (CourseSpinner.getSelectedItemPosition() != 0 )
             if (!(GroupNameInput.getText().toString().compareTo("")==0) )
                 if (!(GroupDescInput.getText().toString().compareTo("") == 0))
-                    if (user.size()>0)
-                        return true;
+                    return user.size() > 1;
 
         return false;
     }
@@ -208,9 +297,12 @@ public static void DeleteEntry(View view)
         Log.i(FRAGMENT_NAME, element);
 
         while(!removed && i< user.size()) {
-            if (user.get(i).compareTo(elementDelete.getText().toString()) == 0) {
+            if (user.get(i).compareTo(elementDelete.getText().toString()) == 0 && i!=0) {
+                students.add(user.get(i));
                 user.remove(i);
+
                 removed = true;
+                adapter.notifyDataSetChanged();
                 addstudentadapter.notifyItemRemoved(i);
                 addstudentadapter.notifyItemRangeChanged(i, user.size() - i);
 
@@ -218,15 +310,25 @@ public static void DeleteEntry(View view)
             i++;
         }
     }
-    private void WriteToDatabase()
+    public void WriteToDatabase()
     {
         Log.i(FRAGMENT_NAME, "Writing to database ");
+
+        for (String member : memberIds)
+        {
+            Log.i(FRAGMENT_NAME, member);
+        }
+        finalmemberIds.add(0, UserId);
+        ArrayList<String> messages = new ArrayList<String>();
         Map<String, Object> group = new HashMap<>();
-        group.put("course", CourseSpinner.getSelectedItemPosition());
+        group.put("course", courses.get(CourseSpinner.getSelectedItemPosition()));
         group.put("description", GroupDescInput.getText().toString());
         group.put("name", GroupNameInput.getText().toString());
         group.put("members", user);
-        ProgressIndicator.setProgressCompat(50, true);
+        group.put("memberEmails", finalmemberEmails);
+        group.put("memberIds", finalmemberIds);
+        group.put("messages", messages);
+      //  ProgressIndicator.setProgressCompat(50, true);
 
 
         db.collection("groups")
@@ -235,8 +337,7 @@ private void WriteToDatabase()
                     @Override
                     public void onSuccess(DocumentReference documentReference) {
                         Log.d(FRAGMENT_NAME, "DocumentSnapshot added with ID: " + documentReference.getId());
-                        ProgressIndicator.setProgressCompat(100, true);
-
+                        //ProgressIndicator.setProgressCompat(100, true);
 
                     }
                 })
@@ -246,10 +347,57 @@ public void onFailure(@NonNull Exception e) {
                         Log.w(FRAGMENT_NAME, "Error adding document", e);
                     }
                 });
-//        this.getActivity().finish();
-//        startActivity(new Intent(this.getActivity().getApplicationContext(),this.getActivity().getClass()));
-        getActivity().onBackPressed();
         Log.i(FRAGMENT_NAME, "Writing to database completed ");
+        getFragmentManager().popBackStack();
+
+    }
+
+
+    /***
+     * Gets the userId that is passed on and finds the name of the user to add to the list of members
+     * Populates the Course Spinner with the data the user enters
+     *
+     * @param UserId
+     */
+    public void PopulateFormDb(String UserId) {
+        Log.i(FRAGMENT_NAME, " " +  UserId);
+        DocumentReference docRef = db.collection("user").document(UserId);
 
+        docRef.get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+            @Override
+            public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                if (task.isSuccessful()) {
+                    DocumentSnapshot document = task.getResult();
+                    if (document.exists()) {
+                        user.add ( (String) document.getString("first_name") + " " + document.getString("last_name")) ;
+                        addstudentadapter.notifyItemInserted(user.size());
+                        Log.i(FRAGMENT_NAME, "Courses : " + document.get("courses"));
+
+                        courses.add("None");
+                        ArrayList<String> dbCourses = (ArrayList<String> ) document.get("courses");
+
+                        for (int i =0; i< dbCourses.size(); i++) {
+                            courses.add(dbCourses.get(i));
+                        }
+                        adapter2.notifyDataSetChanged();
+
+
+                    } else {
+                        Log.d(FRAGMENT_NAME, "No such document");
+                    }
+                } else {
+                    Log.d(FRAGMENT_NAME, "get failed with ", task.getException());
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        user.clear();
+        students.clear();
+       // courses.clear();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/GroupFragment.java b/app/src/main/java/com/example/android/GroupFragment.java
index b75e4df..b5d059e 100644
--- a/app/src/main/java/com/example/android/GroupFragment.java
+++ b/app/src/main/java/com/example/android/GroupFragment.java
@@ -6,16 +6,25 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
+import android.media.Image;
+import android.net.Uri;
 import android.os.Bundle;
 
+import com.google.android.material.snackbar.Snackbar;
+import com.google.firebase.firestore.DocumentChange;
+import com.google.firebase.firestore.EventListener;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
 
+import android.os.CountDownTimer;
+import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -27,77 +36,101 @@
 import android.widget.Toast;
 
 import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.chip.Chip;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.FieldPath;
+import com.google.firebase.firestore.FieldValue;
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.QueryDocumentSnapshot;
 import com.google.firebase.firestore.QuerySnapshot;
 
+import org.w3c.dom.Text;
+
 import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link GroupFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
+
+
+/**
+ * Todo: Create a temp group and check for duplicates
+ */
 public class GroupFragment extends Fragment {
     protected static final String FRAGMENT_NAME="GroupFragment";
     protected static int colorIcon[] = {Color.RED, Color.GREEN, Color.BLUE, Color.YELLOW};
 
-    private static final int[] memberchip={R.id.Chip1,R.id.Chip2,R.id.Chip3};
+    private static final int[] memberchip={R.id.Chip1,R.id.Chip2,R.id.Chip3, R.id.Chip4};
     private final Chip[] switch_buttons=new Chip[memberchip.length];
-
+    //private  Button EmailInstrucorBtn;
     private ViewGroupsAdapter adapter;
     private ArrayList<GroupsInformation> groups = new ArrayList<GroupsInformation>();
     private ListView GroupLists;
-
+    private TextView GroupName;
     private View result;
-
     private TextView message;
     private ImageView GroupIcon;
-    private   TextView GroupDescription;
+    private  TextView GroupDescription;
     private   GroupsInformation info;
     private CardView CardGroup;
     private LayoutInflater inflater;
-
+    private  TextView nogroupinfo;
     private FirebaseFirestore db = FirebaseFirestore.getInstance();
+    private  ImageView refresh;
+    private  AlertDialog.Builder customDialog;
+    private  Dialog dialog;
+    private Button StartChatBtn;
 
     private static class GroupsInformation
     {
-        private  String  id;  //Primary Key
+        private final String  id;  //Primary Key
         private String NameofGroup;
         private String GroupDescription;
+        private  String coursename ;
+        private ArrayList<String> memberEmails;
 
         public  ArrayList<String> members;
 
-        private GroupsInformation(String id , String NameofGroup, String GroupDescription, ArrayList<String> members) {
+        private GroupsInformation(String id , String NameofGroup, String GroupDescription,String coursename, ArrayList<String> members, ArrayList<String> memberEmails,  ArrayList<String> memberIds) {
+            this.id = id;
             this.NameofGroup = NameofGroup ;
             this.GroupDescription =GroupDescription;
+            this.coursename = coursename;
             this.members = members;
+            this.memberEmails = memberEmails;
+
 
         }
+
+        public String getCoursename() {return  this.coursename;}
         public String  getid()
         {
             return this.id;
         }
+        public String getNameofGroup() {return this.NameofGroup;}
+        public String getGroupDescription() {return this.GroupDescription;}
+        public ArrayList<String> getMemberEmails(){return  this.memberEmails;}
+
+        public void setMembers(ArrayList<String> newmembers){this.members = newmembers;}
+        public void setGroupDescription(String newGroupDesc){this.GroupDescription = newGroupDesc; }
+        public void setGroupName(String newName){this.NameofGroup = newName; }
 
         public ArrayList<String> getMembers() {return this.members;}
 
-        public String getNameofGroup()
-        {
-            return this.NameofGroup;
-        }
-        public String getGroupDescription()
-        {
-            return this.GroupDescription;
-        }
     }
-    private class ViewGroupsAdapter extends ArrayAdapter<String> {
 
+    private class ViewGroupsAdapter extends ArrayAdapter<String> {
         public ViewGroupsAdapter(@NonNull Context context, int resource) {
             super(context, resource);
         }
-
         public int getCount() {
             return groups.size();
         }
@@ -106,11 +139,9 @@ public GroupsInformation fetchitem(int position) {
             return groups.get(position);
         }
 
-        @SuppressLint("ViewHolder")
         public View getView(int position, View convertView, ViewGroup parent) {
             inflater = GroupFragment.this.getLayoutInflater();
             result = inflater.inflate(R.layout.group_list_view, null);
-
             message =  result.findViewById(R.id.GroupNameLabel);
             ImageView deleteButton = result.findViewById(R.id.RemoveGroup);
             ImageView Editbutton = result.findViewById(R.id.EditIcon);
@@ -119,8 +150,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
             CardGroup = result.findViewById(R.id.CardGroup);
 
 
-            info  = fetchitem(position);
 
+
+            info  = fetchitem(position);
             deleteButton.setTag(position);
             GroupIcon.setTag(position);
             CardGroup.setTag(position);
@@ -154,98 +186,252 @@ public void onClick(View view) {
                 }
             });
 
+
+
             return result;
         }
 
     }
-    public void DeleteGroupEntry(View view){
 
-        int positionitemToDelete = (int) view.getTag();
-        String GroupName = groups.get(positionitemToDelete).NameofGroup;
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String UserID  = "userID";
+    private static final String username = "username";
 
+    private String mParam1;
+    private String mParam2;
 
-        AlertDialog.Builder builder =
-                new AlertDialog.Builder(this.getContext());
-        builder.setTitle("Are you sure you want to be removed from: " + GroupName);
-        builder.setPositiveButton("Yes",
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        groups.remove(positionitemToDelete);
-                        adapter.notifyDataSetChanged();
-                    } });
-        builder.setNegativeButton("Cancel",
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                    } });
-        AlertDialog dialog = builder.create();
-        dialog.show();
+    public GroupFragment() {
+        // Required empty public constructor
+    }
 
+    public static GroupFragment newInstance(String param1, String param2) {
+        GroupFragment fragment = new GroupFragment();
+        Bundle args = new Bundle();
+        args.putString(UserID, param1);
+        args.putString(username, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View test=inflater.inflate(R.layout.fragment_group, container, false);
+        GroupLists = test.findViewById(R.id.GroupinformationList);
+        nogroupinfo = test.findViewById(R.id.NoGroupinfo);
+        refresh = test.findViewById(R.id.refresh);
+
+        adapter = new ViewGroupsAdapter(this.getContext(), 0 );
+        GroupLists.setAdapter(adapter);
+        nogroupinfo.setText(R.string.NoGroupsPage);
+        nogroupinfo.setVisibility(View.VISIBLE);
+        GroupLists.setVisibility(View.INVISIBLE);
 
+        CardView btn=test.findViewById(R.id.Banner);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getActivity().getSupportFragmentManager().beginTransaction()
+                        .replace(R.id.fragmentContainerView,CreateGroupFragment.class,getArguments())
+                        .setReorderingAllowed(true)
+                        .addToBackStack("tempBackStack")
+                        .commit();
+            }
+        });
+        refresh.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                RefreshPage(view);
+            }
+        });
+        Log.i(FRAGMENT_NAME, "This is the user ID: " + mParam1 );
+        DisplayGroupInfo(mParam1);
+
+
+
+        return test;
     }
 
 
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(UserID);
+            mParam2 = getArguments().getString(username);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        Log.i(FRAGMENT_NAME, "In OnStop");
+        if (dialog != null)
+        {
+            dialog.dismiss();
+        }
+
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (dialog != null)
+        {
+            dialog.dismiss();
+        }
+        Log.i(FRAGMENT_NAME, "In onPause");
+
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+/*        groups.clear();
+        DisplayGroupInfo(mParam2);*/
+
+        // Toast.makeText(getActivity(), "New Change", Toast.LENGTH_SHORT).show();
+
+    }
+
     /****
-     * Displays Group information
+     * queries the database, filtering information based on user registered and adding it to the UI
+     * Refreshes page every 3 seconds for updates from the firebase
+     * @param name of the user that queries the data
      */
-    public void DisplayGroupInfo()
+    public void DisplayGroupInfo(String name)
     {
 
-        db.collection("groups")
-                .get()
-                .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
-                    @Override
-                    public void onComplete(@NonNull Task<QuerySnapshot> task) {
-                        if (task.isSuccessful()) {
-                            for (QueryDocumentSnapshot document : task.getResult()) {
-                                String groupName = document.getString("name");
-                                String groupDesc = document.getString("description");
-                                Log.i( " Array information for members : ", "  " +  document.get("members") ) ;
-
-                                groups.add(new GroupsInformation(document.getId(), groupName, groupDesc, (ArrayList<String>) document.get("members")));
-                                adapter.notifyDataSetChanged();
+                db.collection("groups").whereArrayContains("memberIds", name)
+                        .get()
+                        .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
+                            @Override
+                            public void onComplete(@NonNull Task<QuerySnapshot> task) {
+                                if (task.isSuccessful()) {
+                                    //groups.clear();
+
+                                    for (DocumentChange document : task.getResult().getDocumentChanges() ) {
+                                        String groupName = document.getDocument().getString("name");
+                                        String groupDesc = document.getDocument().getString("description");
+                                        String courseName = document.getDocument().getString("course");
+                                        Log.i( " Array information for members : ", "  " +  document.getDocument().get("members") ) ;
+                                        groups.add(new GroupsInformation(document.getDocument().getId(), groupName, groupDesc, courseName, (ArrayList<String>) document.getDocument().get("members"), (ArrayList<String>) document.getDocument().get("memberEmails"), (ArrayList<String>) document.getDocument().get("membersId"))) ;
+                                        adapter.notifyDataSetChanged();
+                                        if (groups.size()>0 )
+                                        {
+                                            GroupLists.setVisibility(View.VISIBLE);
+                                            nogroupinfo.setVisibility(View.INVISIBLE);
+
+                                        }
+                                    }
+
+                                    //Toast.makeText(getActivity(), "Page Refreshed ", Toast.LENGTH_LONG).show();
+                                } else {
+                                    Log.w(FRAGMENT_NAME, "Error getting documents or no changes yet.", task.getException());
+                                }
                             }
-                        } else {
-                            Log.w(FRAGMENT_NAME, "Error getting documents.", task.getException());
-                        }
-                    }
-                });
+
+                        });
+               // Log.i(FRAGMENT_NAME, "This is the second param: " + name );
+
+            }
+
+
 
 
 
 
-    }
 
 
+
+
+    /**
+     * On click handler to display more information about the group information when clicked
+     * @param view
+     */
+
     public void ShowGroupInfo(View view)
     {
 
+        int positionitem= (int) view.getTag();
+
         LayoutInflater inflater = this.getLayoutInflater();
         final View views = inflater.inflate(R.layout.groups_custom_dialog_box, null);
+       // EmailInstrucorBtn = views.findViewById(R.id.EmailInstructorBtn);
+        StartChatBtn = views.findViewById(R.id.StartChat);
+     /*   EmailInstrucorBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                EmailInstructor(view, positionitem);
+            }
+        });
+*/
+        StartChatBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getActivity(), Groupchat.class);
+                intent.putExtra("groupid", groups.get(positionitem).id);
+                DocumentReference docRef = db.collection("user").document(mParam1);
+
+                docRef.get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+                    @Override
+                    public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                        if (task.isSuccessful()) {
+                            DocumentSnapshot document = task.getResult();
+                            if (document.exists()) {
+                                String name =  (String) document.getString("first_name") + " " + document.getString("last_name") ;
+                                intent.putExtra("name", name);
+                                startActivity(intent);
+
+                            } else {
+                                Log.d(FRAGMENT_NAME, "No such document");
+                            }
+                        } else {
+                            Log.d(FRAGMENT_NAME, "get failed with ", task.getException());
+                        }
+                    }
+                });
+
+
+            }
+        });
+
 
         Log.i(FRAGMENT_NAME, "List Item Clicked");
-        int positionitem= (int) view.getTag();
         GroupsInformation group = groups.get(positionitem);
-
-        TextView GroupName = views.findViewById(R.id.ViewGroupName);
+        GroupName = views.findViewById(R.id.ViewGroupName);
         TextView GroupDesc = views.findViewById(R.id.ViewGroupDesc);
-        TextView Instructor = views.findViewById(R.id.ViewGroupInstructor);
-        for (int i =0; i < group.members.size(); i++)
+        TextView CourseName  = views.findViewById(R.id.ViewGroupInstructor);
+
+        for (int i =0; i < (group.getMembers().size()); i++)
         {
             switch_buttons[i]= views.findViewById(memberchip[i]);
             switch_buttons[i].setVisibility(View.VISIBLE);
-            switch_buttons[i].setText(group.members.get(i));
+            switch_buttons[i].setText(group.getMembers().get(i));
 
         }
 
 
-        GroupName.setText(group.NameofGroup);
-        GroupDesc.setText(group.GroupDescription);
-        Instructor.setText("Instructor: Mawlood-Yunis"); // Todo: Let the firebase query the course instructor data
-        AlertDialog.Builder customDialog =  new AlertDialog.Builder(this.getContext());
+        GroupName.setText(group.getNameofGroup());
+        GroupDesc.setText(group.getGroupDescription()) ;
+
+        CourseName.setText(group.getCoursename());
+
+        customDialog =  new AlertDialog.Builder(this.getContext());
         customDialog.setView(views)
-                .setPositiveButton("Close", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.Close, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int id) {
+                        dialog.dismiss();
 
                     }
                 });
@@ -257,24 +443,38 @@ public void onClick(DialogInterface dialog, int id) {
 
 
     /****
+     * Starts the Email Intent to send an email to the instructor directly
      * TODO: Start Email Intent to email instructor directly, would need instructor email from firebase
      * @param view
      */
-    public void EmailInstructor(View view)
+    public void EmailInstructor(View view, int positionitem )
     {
+        GroupsInformation info = groups.get(positionitem);
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        Log.i(FRAGMENT_NAME, "members: " + info.getMemberEmails());
+        intent.putExtra(Intent.EXTRA_EMAIL, (String[]) info.getMemberEmails().toArray(new String[info.getMemberEmails().size()]));
+        intent.putExtra(Intent.EXTRA_SUBJECT, "Email from "+ GroupName.getText());
+        intent.setData(Uri.parse("mailto:"));
+        if (intent.resolveActivity(getActivity().getPackageManager()) != null) {
+
+            startActivity(intent);
+
+        } else {
+            Toast.makeText(getActivity(), R.string.EmailErr,
+                    Toast.LENGTH_SHORT).show();
+        }
+
+
 
     }
 
-    /***
-     * TODO: Start EmailGroup Intent to email groups directly, would need user email from firebase
+
+    /**
+     * Enables the user to edit their information, either about the group or description of the group
+     * OnClick Handler of the green edit pencil icon gets called by this
      * @param view
      */
 
-    public void EmailGroup(View view )
-    {
-
-    }
-
     public void EditGroups(View view )
     {
 
@@ -285,95 +485,167 @@ public void EditGroups(View view )
         int positionitem= (int) view.getTag();
         GroupsInformation group = groups.get(positionitem);
 
-
-
-        AlertDialog.Builder customDialog =  new AlertDialog.Builder(this.getContext());
+        customDialog =  new AlertDialog.Builder(this.getContext());
         customDialog.setView(views)
-                .setPositiveButton("Save", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.SaveButtonText, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int id) {
+                        boolean changed = false;
                         EditText NewGroupName = views.findViewById(R.id.GroupNameEdit);
                         EditText NewGroupDesc = views.findViewById(R.id.GroupDescEdit);
-                        group.NameofGroup = NewGroupName.getText().toString();
-                        group.GroupDescription = NewGroupDesc.getText().toString();
-                        adapter.notifyDataSetChanged();
+
+                        if (NewGroupName.getText().toString().compareTo("") != 0 ){
+                            changed = true;
+                            group.setGroupName(NewGroupName.getText().toString());
+                        }
+                        if (NewGroupDesc.getText().toString().compareTo("") != 0 ) {
+                            changed = true;
+                            group.setGroupDescription( NewGroupDesc.getText().toString());
+                        }
+
+                        if(changed) {
+                            adapter.notifyDataSetChanged();
+                            updateDatabase(group.getid(), group.getNameofGroup(), group.getGroupDescription());
+                        }
 
                     }
 
                 });
-        Dialog dialog = customDialog.create();
+        dialog = customDialog.create();
         dialog.show();
 
 
     }
 
 
+    /**
+     * Gets called to update the database information once user changes either the group name or the group Description
+     * @param id : The group id key of the new group instance
+     * @param groupname : Name of the new group
+     * @param groupdescription : Description of the group
+     * @return true: If data has been succefully updated
+     *
+     */
+    public boolean updateDatabase(String id, String groupname, String groupdescription)
+    {
+        Log.i(FRAGMENT_NAME, "Message id: " + id);
+        DocumentReference groupRef = db.collection("groups").document(id);
+        groupRef
+                .update("name", groupname)
+                .addOnSuccessListener(new OnSuccessListener<Void>() {
+                    @Override
+                    public void onSuccess(Void aVoid) {
+                        Log.d(FRAGMENT_NAME, "Group name successfully updated!");
+                    }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        Log.w(FRAGMENT_NAME, "Error updating document id:" + id, e);
 
+                    }
+                });
 
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
+        groupRef
+                .update("description", groupdescription)
+                .addOnSuccessListener(new OnSuccessListener<Void>() {
+                    @Override
+                    public void onSuccess(Void aVoid) {
+                        Log.d(FRAGMENT_NAME, "Group Desc successfully updated!");
+                    }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        Log.w(FRAGMENT_NAME, "Error updating document", e);
+                    }
+                });
+        return true;
+    }
+    /***
+     * On Click Handler for delete button icon, gets called when user wants to remove themselves from the group
+     * Updates the arrayList and notifys data has been changed, calls the delete database fuction to notify
+     * of item being deleted to the firebase
+     * @param view
+     */
+    public void DeleteGroupEntry(View view){
 
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
+        int positionitemToDelete = (int) view.getTag();
+        GroupsInformation groupdel = groups.get(positionitemToDelete);
+        String GroupName = groups.get(positionitemToDelete).getNameofGroup();
+
+
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(this.getContext());
+
+        builder.setTitle("Are you sure you want to be removed from:" +  GroupName);
+        builder.setPositiveButton(R.string.Yes,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        groups.remove(positionitemToDelete);
+                        adapter.notifyDataSetChanged();
+                        if (groups.size() == 0 )
+                        {
+                            nogroupinfo.setVisibility(View.VISIBLE);
+                            GroupLists.setVisibility(View.INVISIBLE);
+                        }
+                        Log.i(FRAGMENT_NAME, "This is the user: " + mParam2);
+                        deletefromdatabase(groupdel.getid(), mParam2 ); //TODO: change mparam2 to username
+                    } });
+        builder.setNegativeButton("Cancel",
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                    } });
+        dialog = builder.create();
+        dialog.show();
 
-    public GroupFragment() {
-        // Required empty public constructor
     }
 
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment GroupFragment.
+
+    /***
+     * Removes the user from the group.
+     * @param groupid : Instance id of the group
+     * @param username : Name of the user who wants to be removed
      */
-    // TODO: Rename and change types and number of parameters
-    public static GroupFragment newInstance(String param1, String param2) {
-        GroupFragment fragment = new GroupFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
+    public void deletefromdatabase(String groupid, String username)
+    {
+        DocumentReference groupsRef = db.collection("groups").document(groupid);
+        Log.i(FRAGMENT_NAME, "Group id " + groupid + " username " + username);
+        groupsRef.update("members", FieldValue.arrayRemove(username));
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
+
+        /***
+         * TODO before final submission: Check if the group has only one member, delete the document if so
+         */
     }
 
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View test=inflater.inflate(R.layout.fragment_group, container, false);
-//        FragmentManager fragmentManager =getSupportFragmentManager();
 
-        GroupLists = test.findViewById(R.id.GroupinformationList);
-        adapter = new ViewGroupsAdapter(this.getContext(), 0 );
-        GroupLists.setAdapter(adapter);
-        DisplayGroupInfo();
+    /**
+     * Refreshes the page when clicked
+     */
 
-        CardView btn=test.findViewById(R.id.Banner);
-        btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                getActivity().getSupportFragmentManager().beginTransaction()
-                        .replace(R.id.fragmentContainerView,CreateGroupFragment.class,null)
-                        .setReorderingAllowed(true)
-                        .addToBackStack("tempBackStack")
-                        .commit();
-            }
-        });
-        return test;
+    public void RefreshPage(View view)
+    {
+        Toast.makeText(getActivity(), "Page refreshed ", Toast.LENGTH_SHORT).show();
+        DisplayGroupInfo(mParam2);
     }
+
+    /**
+     * Debugging functionality for Snackbar
+     * @param message message to display
+     * @param color   color of the snackbar
+     * @param duration duration of the time it takes to display
+     */
+    private void PrintSnackbar(String message, int color, int duration)
+    {
+        Snackbar snackbar = Snackbar.make(this.getActivity().findViewById(R.id.linearLayout), message, duration)
+                .setAction("Action", null);
+        View snackview = snackbar.getView();
+        snackview.setBackgroundColor(color);
+        snackbar.show();
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/Groupchat.java b/app/src/main/java/com/example/android/Groupchat.java
new file mode 100644
index 0000000..8d010a5
--- /dev/null
+++ b/app/src/main/java/com/example/android/Groupchat.java
@@ -0,0 +1,261 @@
+package com.example.android;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.android.gms.tasks.OnCompleteListener;
+
+import android.annotation.SuppressLint;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.firestore.DocumentChange;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.FieldValue;
+import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.QuerySnapshot;
+import com.google.firebase.messaging.FirebaseMessagingService;
+
+import org.checkerframework.checker.units.qual.A;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Groupchat extends AppCompatActivity {
+    Button Send;
+    EditText TextField;
+    ListView Texts;
+    ArrayList<String> messages = new ArrayList<String>();
+    protected FirebaseFirestore db = FirebaseFirestore.getInstance();
+    ChatAdapter messageAdapter;
+    String name;
+
+
+    private class ChatAdapter extends ArrayAdapter<String> {
+
+
+        public ChatAdapter(Context ctx) {
+            super(ctx, 0);
+
+        }
+
+        public int getCount() {
+            return messages.size();
+        }
+
+        public String getItem(int position) {
+            return messages.get(position);
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = Groupchat.this.getLayoutInflater();
+            String[] messages = getItem(position).split(" ", 3);
+
+            String user = messages[0] + " "+ messages[1];
+            String messageString = messages[2];
+
+            View result = null;
+            if (user.compareTo(name) != 0 ) {
+                result = inflater.inflate(R.layout.message_from_user, null);
+                TextView msg = result.findViewById(R.id.message);
+                msg.setText(messageString);
+
+            }
+            else {
+                result = inflater.inflate(R.layout.message_from_person, null);
+                TextView msg = result.findViewById(R.id.message);
+                msg.setText(messageString);
+            }
+
+            TextView name = (TextView) result.findViewById(R.id.nameMessage);
+            name.setText(user); // get the string at position
+            return result;
+        }
+
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_groupchat);
+        Send = findViewById(R.id.SendButton);
+        TextField = findViewById(R.id.EnterMsg);
+        Texts = findViewById(R.id.ListArray);
+        messageAdapter = new ChatAdapter(this);
+        Texts.setAdapter(messageAdapter);
+        Intent intent = getIntent();
+
+        String groupId = intent.getStringExtra("groupid");
+        name = intent.getStringExtra("name");
+
+        GetInformation(groupId);
+
+
+        Send.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String message = TextField.getText().toString();
+                messages.add(name + " " + message);
+                messageAdapter.notifyDataSetChanged();
+                WriteMessagetoDatabase(messages.size(), groupId, name );
+
+
+            }
+        });
+
+
+
+    }
+
+    public void WriteMessagetoDatabase(int position, String groupid, String name)
+    {
+
+
+        db.collection("groups")
+                .document(groupid)
+                .update("messages", FieldValue.arrayUnion( messages.get(position-1)));
+        Toast.makeText(this, "Sent!", Toast.LENGTH_LONG);
+        TextField.setText("");
+
+    }
+
+    public void GetInformation(String groupid)
+    {
+        db.collection("groups").document(groupid)
+        .get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+            @Override
+            public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                if (task.isSuccessful()) {
+                    DocumentSnapshot document = task.getResult();
+                    if (document.exists()) {
+                        messages.clear();
+                        messages =  (ArrayList<String> ) document.get("messages");
+
+                        if (messages!=null) {
+                            messageAdapter.notifyDataSetChanged();
+                        }
+
+                    } else {
+                        Log.d("Helo", "No such document");
+                    }
+                } else {
+                    Log.d("Hello", "get failed with ", task.getException());
+                }
+            }
+        });
+    }
+}
+
+
+/*
+
+public class ChatWindow extends AppCompatActivity {
+
+
+
+
+    private static final String ACTIVITY_NAME = "CHATWINDOW ACTIVITY";
+    Button Send;
+    TextView TextField;
+    ListView Texts;
+    ChatDatabaseHelper chat = null;
+    ArrayList<String> messages = new ArrayList<String>();
+    Cursor cursor;
+
+
+
+
+
+
+    @SuppressLint("Range") // The code gave a warning of cursor being -1 which didnt apply because im checking for the null value first and moving it to the first colimn
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        chat = new ChatDatabaseHelper(this);
+        SQLiteDatabase chats = chat.getWritableDatabase();
+        setContentView(R.layout.activity_chat_window);
+        Send = findViewById(R.id.SendButton);
+        TextField = (EditText) findViewById(R.id.TextView);
+        Texts = findViewById(R.id.ListArray);
+        ChatAdapter messageAdapter = new ChatAdapter(this);
+        Texts.setAdapter(messageAdapter);
+
+        if (findViewById(R.id.FrameId) !=null )
+        {
+            Toast.makeText(this, "In Tablet view", Toast.LENGTH_SHORT).show();
+        }
+
+        Texts.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                Toast.makeText(ChatWindow.this, "item " + i + " Clicked", Toast.LENGTH_SHORT).show();
+
+
+            }
+        });
+
+        cursor = chats.rawQuery(
+                "SELECT "  + ChatDatabaseHelper.KEY_ID + "," + chat.KEY_MESSAGE + "  FROM " + ChatDatabaseHelper.TABLE_NAME, null);
+
+
+
+        if (cursor!=null ) {
+            Log.i(ACTIVITY_NAME, "Cursors column count =" + cursor.getColumnCount());
+            cursor.moveToFirst();
+            while (!cursor.isAfterLast()) {
+                Log.i(ACTIVITY_NAME, "SQL Message: " + cursor.getString(cursor.getColumnIndex(chat.KEY_MESSAGE)));
+                messages.add(cursor.getString(cursor.getColumnIndex(chat.KEY_MESSAGE)));
+                cursor.moveToNext();
+
+            }
+        }
+        // Also, print an information message about the Cursor:
+
+        for (int i = 0; i < cursor.getColumnCount(); i++) {
+
+            {
+                Log.i(ACTIVITY_NAME, "Column name : " + cursor.getColumnName(i));
+            }
+
+            Send.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    ContentValues storeMessage = new ContentValues();
+                    storeMessage.put(chat.KEY_MESSAGE, TextField.getText().toString());
+                    chats.insert(ChatDatabaseHelper.TABLE_NAME, "NullPlaceHolder",  storeMessage);
+                    messages.add(TextField.getText().toString());
+                    messageAdapter.notifyDataSetChanged(); //this restarts the process of getCount()/
+                    TextField.setText("");
+
+
+                }
+            });
+
+
+        }
+
+    }
+
+    public void onDestroy() {
+        Log.i(ACTIVITY_NAME, "Destroying Data and closing database");
+        super.onDestroy();
+        chat.close();
+
+    }
+*/
+
diff --git a/app/src/main/java/com/example/android/LoginActivity.java b/app/src/main/java/com/example/android/LoginActivity.java
index d07767e..2b5623c 100644
--- a/app/src/main/java/com/example/android/LoginActivity.java
+++ b/app/src/main/java/com/example/android/LoginActivity.java
@@ -1,6 +1,7 @@
 package com.example.android;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
@@ -20,6 +21,9 @@
 public class LoginActivity extends AppCompatActivity {
     protected static final String ACTIVITY_NAME="LoginActivity";
     private FirebaseAuth mAuth;
+    private  EditText usernameET;
+    private  EditText passwordET;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,6 +33,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mAuth = FirebaseAuth.getInstance();
         Log.i(ACTIVITY_NAME,"In OnCreate()");
+        usernameET = (EditText) findViewById(R.id.usernametext);
+        passwordET=(EditText) findViewById(R.id.passwordtext);
     }
 
     @Override
@@ -47,44 +53,96 @@ public void onStart() {
 //    }
 
     public void logInAction(View view){
-        EditText usernameET = (EditText) findViewById(R.id.usernametext);
+        usernameET = (EditText) findViewById(R.id.usernametext);
         String email = usernameET.getText().toString();
         EditText passwordET=(EditText) findViewById(R.id.passwordtext);
         String password = passwordET.getText().toString();
+
+
         //need to check if user exists in database
-        mAuth.signInWithEmailAndPassword(email, password)
-                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
-                    @Override
-                    public void onComplete(@NonNull Task<AuthResult> task) {
-                        if (task.isSuccessful()) {
-                            // Sign in success, update UI with the signed-in user's information
-                            Log.d(ACTIVITY_NAME, "signInWithEmail:success");
-                            FirebaseUser user = mAuth.getCurrentUser();
-                            String userID = user.getUid();
-                            updateUI(user, userID);
-                        } else {
-                            // If sign in fails, display a message to the user.
-                            Log.w(ACTIVITY_NAME, "signInWithEmail:failure", task.getException());
-                            Toast.makeText(LoginActivity.this, "Authentication failed.",
-                                    Toast.LENGTH_SHORT).show();
+
+        if (email.compareTo("") == 0 || password.compareTo("") == 0 )
+        {
+            usernameET.setError("Please ensure all forms are completed ");
+        }
+        else {
+            mAuth.signInWithEmailAndPassword(email, password)
+                    .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                        @Override
+                        public void onComplete(@NonNull Task<AuthResult> task) {
+                            if (task.isSuccessful()) {
+                                // Sign in success, update UI with the signed-in user's information
+                                Log.d(ACTIVITY_NAME, "signInWithEmail:success");
+                                FirebaseUser user = mAuth.getCurrentUser();
+                                String userID = user.getUid();
+                                updateUI(user, userID);
+                            } else {
+                                // If sign in fails, display a message to the user.
+                                Log.w(ACTIVITY_NAME, "signInWithEmail:failure", task.getException());
+
+                                Toast.makeText(LoginActivity.this, "Authentication failed.",
+                                        Toast.LENGTH_SHORT).show();
+                            }
                         }
-                    }
-                });
+                    });
+        }
     }
 
     private void updateUI(FirebaseUser user, String userID) {
 
         Intent intent=new Intent(LoginActivity.this,MainActivity.class);
         intent.putExtra("userID", userID);
-        startActivity(intent);
+        startActivityForResult(intent, 1);
+
     }
 
+
     public void goToRegisterActivity(View view){
         Intent intent=new Intent(LoginActivity.this,RegisterActivity.class);
         startActivity(intent);
     }
 
-//    public Boolean validate(String username,String password){
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        SignUserOut();
+
+    }
+
+    public void SignUserOut()
+    {
+
+    }
+
+
+
+    public void ForgotPassword(View view)
+    {
+
+        String emailAddress = usernameET.getText().toString();
+        Log.i(ACTIVITY_NAME, "Email add: " + emailAddress);
+
+        if (emailAddress.compareTo("") != 0 ) {
+            mAuth.sendPasswordResetEmail(emailAddress)
+                    .addOnCompleteListener(new OnCompleteListener<Void>() {
+                        @Override
+                        public void onComplete(@NonNull Task<Void> task) {
+                            if (task.isSuccessful()) {
+                                Log.i(ACTIVITY_NAME, "Email sent.");
+                                Toast.makeText(LoginActivity.this, "Email Sent!", Toast.LENGTH_SHORT).show();
+                                passwordET.setVisibility(View.VISIBLE);
+                            }
+                        }
+                    });
+        }
+        else
+        {
+
+            passwordET.setVisibility(View.INVISIBLE);
+            Toast.makeText(this, "Please enter an email address and click forgot password", Toast.LENGTH_LONG).show();
+        }
+    }
+    //    public Boolean validate(String username,String password){
 //        if (TextUtils.isEmpty(password)){
 //            Toast.makeText(LoginActivity.this,R.string.psswrd_error_message, Toast.LENGTH_SHORT).show();
 //            return false;
diff --git a/app/src/main/java/com/example/android/MainActivity.java b/app/src/main/java/com/example/android/MainActivity.java
index 2beca53..9879a65 100644
--- a/app/src/main/java/com/example/android/MainActivity.java
+++ b/app/src/main/java/com/example/android/MainActivity.java
@@ -1,16 +1,26 @@
 package com.example.android;
 
+import android.app.Dialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import android.widget.Button;
+import androidx.appcompat.widget.Toolbar;
 
 import java.util.ArrayList;
 
@@ -20,16 +30,80 @@ public class MainActivity extends AppCompatActivity {
     String termPref;
     ArrayList<String> coursePref;
     ArrayList<String> levelPref;
+   public static String UserId;
     Button classButton;
     Button groupButton;
     Button appointmentButton;
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_main, menu);
+       classButton.performClick(); // Might need to change, this actually loads the first fragment and pases the Bundle info
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.action_settings:
+                return true;
+            case R.id.help:
+                showHelp();
+                return true;
+            case R.id.Signout:
+                SignUserOut();
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+
+    public void showHelp()
+    {
+
+        LayoutInflater inflater = this.getLayoutInflater();
+        final View views = inflater.inflate(R.layout.help_dialog_box, null);
+
+        AlertDialog.Builder customDialog =  new AlertDialog.Builder(this);
+        customDialog.setView(views)
+                .setPositiveButton(R.string.Close, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+
+                    }
+                });
+
+        Dialog dialog = customDialog.create();
+        dialog.show();
+    }
+
+    public void SignUserOut()
+    {
+        startActivity(new Intent(this, LoginActivity.class));// TODO: Might need to actually ask firebase to do this
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        for (Fragment fragment : getSupportFragmentManager().getFragments()) {
+            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
+        }
         setContentView(R.layout.activity_main);
-
         Bundle extras=getIntent().getExtras();
+        //UserId= extras.getString("userId");
+        appointmentButton=findViewById(R.id.schedule_button);
+        classButton=findViewById(R.id.class_button);
+        groupButton=findViewById(R.id.groups_button);
+        classButton.setBackgroundColor(Color.GREEN);
+
+        Toolbar myToolbar = (Toolbar) findViewById(R.id.my_toolbar);
+        setSupportActionBar(myToolbar);
+
+
+
 //        termPref=extras.getString("term");
 //        yearPref=extras.getString("year");
 //        levelPref=(ArrayList<String>) getIntent().getSerializableExtra("level");
@@ -41,45 +115,57 @@ protected void onCreate(Bundle savedInstanceState) {
 
         FragmentManager fragmentManager =getSupportFragmentManager();
 
-        classButton=findViewById(R.id.class_button);
         classButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                classButton.setBackgroundColor(Color.GREEN);
+                groupButton.setBackgroundColor(getResources().getColor(R.color.purple_500));
+                appointmentButton.setBackgroundColor(getResources().getColor(R.color.purple_500));
+
                 fragmentManager.beginTransaction()
                         .replace(R.id.fragmentContainerView,ClassFragment.class,extras)
-                        .setReorderingAllowed(true)
                         .addToBackStack("tempBackStack")
                         .commit();
             }
         });
-        groupButton=findViewById(R.id.groups_button);
-        groupButton.setOnClickListener(new View.OnClickListener() {
+        appointmentButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                classButton.setBackgroundColor(getResources().getColor(R.color.purple_500));
+                groupButton.setBackgroundColor(getResources().getColor(R.color.purple_500));
+                appointmentButton.setBackgroundColor(Color.GREEN);
+
                 fragmentManager.beginTransaction()
-                        .replace(R.id.fragmentContainerView,GroupFragment.class,null)
+                        .replace(R.id.fragmentContainerView,AppointmentFragment.class,null)
                         .setReorderingAllowed(true)
                         .addToBackStack("tempBackStack")
                         .commit();
             }
         });
-        appointmentButton=findViewById(R.id.schedule_button);
-        appointmentButton.setOnClickListener(new View.OnClickListener() {
+
+        groupButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                classButton.setBackgroundColor(getResources().getColor(R.color.purple_500));
+                groupButton.setBackgroundColor(Color.GREEN);
+                appointmentButton.setBackgroundColor(getResources().getColor(R.color.purple_500));
                 fragmentManager.beginTransaction()
-                        .replace(R.id.fragmentContainerView,AppointmentFragment.class,null)
+                        .replace(R.id.fragmentContainerView,GroupFragment.class,extras)
                         .setReorderingAllowed(true)
                         .addToBackStack("tempBackStack")
                         .commit();
             }
         });
+
     }
 
-    public void newEventAction(View view)
+/*    public void newEventAction(View view)
     {
         startActivity(new Intent(this, EventLayoutActivity.class));
-    }
-
+    }*/
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/RegisterActivity.java b/app/src/main/java/com/example/android/RegisterActivity.java
index 5d85ca3..722a849 100644
--- a/app/src/main/java/com/example/android/RegisterActivity.java
+++ b/app/src/main/java/com/example/android/RegisterActivity.java
@@ -71,6 +71,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                             Map<String, Object> currUser = new HashMap<>();
                             currUser.put("first_name", firstName);
                             currUser.put("last_name", lastName);
+                            currUser.put("email", email);
                             users.document(userID).set(currUser);
 
                             updateUI(user, userID);
diff --git a/app/src/main/res/drawable/class_icon.xml b/app/src/main/res/drawable/class_icon.xml
new file mode 100644
index 0000000..dbd3e87
--- /dev/null
+++ b/app/src/main/res/drawable/class_icon.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#0048FD"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/help_icon.xml b/app/src/main/res/drawable/help_icon.xml
new file mode 100644
index 0000000..20ed977
--- /dev/null
+++ b/app/src/main/res/drawable/help_icon.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#0048FD"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+</vector>
diff --git a/app/src/main/res/drawable/login_icon.xml b/app/src/main/res/drawable/login_icon.xml
new file mode 100644
index 0000000..7f2b39e
--- /dev/null
+++ b/app/src/main/res/drawable/login_icon.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#9654B0"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5,-5L11,7zM20,19h-8v2h8c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-8v2h8V19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh.xml b/app/src/main/res/drawable/refresh.xml
new file mode 100644
index 0000000..ce2e4db
--- /dev/null
+++ b/app/src/main/res/drawable/refresh.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#0048FD"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_groupchat.xml b/app/src/main/res/layout/activity_groupchat.xml
new file mode 100644
index 0000000..52b800c
--- /dev/null
+++ b/app/src/main/res/layout/activity_groupchat.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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">
+
+    <ListView
+        android:id="@+id/ListArray"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentStart="true"
+        android:layout_above="@+id/SendButton"
+        android:layout_alignParentBottom="true" />
+
+    <EditText
+        android:id="@+id/EnterMsg"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+    <Button
+        android:id="@+id/SendButton"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Send" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 26d3206..c245f7a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,60 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<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="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center"
-    android:padding="24dp"
-    tools:context=".LoginActivity">
-
-    <TextView
-        android:id="@+id/usernametextview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/username_login_form">
-    </TextView>
+    android:layout_height="match_parent"
+    android:background="@color/eggshell">
 
-    <EditText
-        android:id="@+id/usernametext"
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textEmailAddress"
-        android:hint="@string/username_login_form_hint"
-        ></EditText>
+        android:layout_height="wrap_content"
+        android:src="@drawable/login_icon"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
-        android:id="@+id/passwordtextview"
+    <LinearLayout
+        android:id="@+id/linearLayout5"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/password_login_form">
-    </TextView>
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:context=".LoginActivity">
 
-    <EditText
-        android:id="@+id/passwordtext"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textPassword"
+        <TextView
+            android:id="@+id/usernametextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/username_login_form"></TextView>
 
-        ></EditText>
+        <EditText
+            android:id="@+id/usernametext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:hint="@string/username_login_form_hint"
+            android:inputType="textEmailAddress"></EditText>
 
-    <Button
-        android:id="@+id/loginButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/login_button_text"
-        android:onClick="logInAction"
-        ></Button>
+        <TextView
+            android:id="@+id/passwordtextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/password_login_form"></TextView>
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/goToRegisterBtn"
-        android:text="@string/go_to_register"
-        android:onClick="goToRegisterActivity"
-        ></Button>
+        <EditText
+            android:id="@+id/passwordtext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textPassword"
+
+            ></EditText>
+
+        <Button
+            android:id="@+id/loginButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="logInAction"
+            android:text="@string/login_button_text"></Button>
+
+<!--        <Button
+            android:id="@+id/goToRegisterBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="goToRegisterActivity"
+            android:text="@string/go_to_register"/>-->
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/go_to_register"
+            android:layout_margin="10dp"
+            android:onClick="goToRegisterActivity"
+            android:textColor="@color/purple_700"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Forgot Password"
+            android:onClick="ForgotPassword"
+            android:textColor="@color/purple_700"/>
 
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f219a5e..e86b91a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -7,44 +7,70 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/my_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#CBC3E3"
+        android:elevation="4dp"
+
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
     <LinearLayout
+        android:id="@+id/linearLayout3"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <Button
             android:id="@+id/class_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Classes" />
+            android:layout_margin="10dp"
+            android:text="@string/Classes" />
 
         <Button
-            android:id="@+id/groups_button"
+            android:id="@+id/schedule_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Groups" />
+            android:layout_margin="10dp"
+            android:text="@string/Appointments" />
 
         <Button
-            android:id="@+id/schedule_button"
+            android:id="@+id/groups_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Appointments" />
+            android:layout_margin="10dp"
+            android:text="@string/Groups" />
+
+
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/FragmentMain"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@id/linearLayout3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/my_toolbar">
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/fragmentContainerView"
             android:name="com.example.android.ClassFragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="647dp" />
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index fa40834..6e3861f 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -1,96 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center"
-    android:padding="24dp"
-    tools:context=".RegisterActivity">
+    android:layout_height="match_parent"
 
-    <TextView
-        android:id="@+id/firstNametextview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/firstName_register_form">
-    </TextView>
+    >
 
-    <EditText
-        android:id="@+id/firstNametext"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textEmailAddress"
-        android:hint="@string/firstName_register_form_hint"
-        ></EditText>
 
     <TextView
-        android:id="@+id/lastNametextview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/lastName_register_form">
-    </TextView>
+        android:layout_height="wrap_content"
+        android:text="@string/banner_registration_page"
+        android:textAllCaps="true"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:gravity="center"
+        android:textSize="20sp"
+        android:textColor="@color/purple_700"/>
 
-    <EditText
-        android:id="@+id/lastNametext"
+    <LinearLayout
+        android:id="@+id/linearLayout4"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textEmailAddress"
-        android:hint="@string/lastName_register_form_hint"
-        ></EditText>
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:context=".RegisterActivity">
 
-    <TextView
-        android:id="@+id/emailtextview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/email_register_form">
-    </TextView>
+        <TextView
+            android:id="@+id/firstNametextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/firstName_register_form"></TextView>
 
-    <EditText
-        android:id="@+id/emailtext"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textEmailAddress"
-        android:hint="@string/email_register_form_hint"
-        ></EditText>
+        <EditText
+            android:id="@+id/firstNametext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:hint="@string/firstName_register_form_hint"
+            android:inputType="textEmailAddress"
+            tools:ignore="TouchTargetSizeCheck"></EditText>
 
-    <TextView
-        android:id="@+id/regPasswordtextview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/password_login_form">
-    </TextView>
+        <TextView
+            android:id="@+id/lastNametextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/lastName_register_form"></TextView>
 
-    <EditText
-        android:id="@+id/regPasswordtext"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textPassword"
+        <EditText
+            android:id="@+id/lastNametext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:hint="@string/lastName_register_form_hint"
+            android:inputType="textEmailAddress"></EditText>
 
-        ></EditText>
+        <TextView
+            android:id="@+id/emailtextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/email_register_form"></TextView>
 
-    <TextView
-        android:id="@+id/passwordConfirmationtextview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/password_confirmation_register_form">
-    </TextView>
+        <EditText
+            android:id="@+id/emailtext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:hint="@string/email_register_form_hint"
+            android:inputType="textEmailAddress"></EditText>
 
-    <EditText
-        android:id="@+id/passwordConfirmationtext"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:inputType="textPassword"
+        <TextView
+            android:id="@+id/regPasswordtextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/password_login_form"></TextView>
 
-        ></EditText>
+        <EditText
+            android:id="@+id/regPasswordtext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textPassword"
 
-    <Button
-        android:id="@+id/registerButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/register_button_text"
-        android:onClick="registerAction"
-        ></Button>
+            ></EditText>
+
+        <TextView
+            android:id="@+id/passwordConfirmationtextview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/password_confirmation_register_form"></TextView>
+
+        <EditText
+            android:id="@+id/passwordConfirmationtext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inputType="textPassword"
+
+            ></EditText>
+
+        <Button
+            android:id="@+id/registerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="registerAction"
+            android:text="@string/register_button_text"></Button>
 
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_book_appointment.xml b/app/src/main/res/layout/fragment_book_appointment.xml
index b8d1952..a25dbd1 100644
--- a/app/src/main/res/layout/fragment_book_appointment.xml
+++ b/app/src/main/res/layout/fragment_book_appointment.xml
@@ -60,7 +60,6 @@
         android:text="New Appointment"
         android:background="@null"
         android:textStyle="bold"
-        android:onClick="newEventAction"
         android:layout_gravity="center"
         android:textSize="20sp"/>
 
diff --git a/app/src/main/res/layout/fragment_class.xml b/app/src/main/res/layout/fragment_class.xml
deleted file mode 100644
index abb8802..0000000
--- a/app/src/main/res/layout/fragment_class.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ClassFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:id="@+id/classFragmentTextView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="20dp"
-        android:text=""
-        android:textAlignment="center"
-        android:textSize="34sp"
-        android:textStyle="bold" />
-
-        <Button
-            android:id="@+id/viewClassBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="275dp"
-            android:layout_gravity="center"
-
-            android:text="View Classes"
-            />
-
-        <Button
-            android:id="@+id/addClassBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="225dp"
-            android:layout_gravity="center"
-            android:text="Add Class"
-
-            />
-        <Button
-            android:id="@+id/removeClassBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="175dp"
-            android:layout_gravity="center"
-            android:text="Remove Class"
-
-
-
-            />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_create_group.xml b/app/src/main/res/layout/fragment_create_group.xml
index ac9ebfb..83759c0 100644
--- a/app/src/main/res/layout/fragment_create_group.xml
+++ b/app/src/main/res/layout/fragment_create_group.xml
@@ -5,16 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".CreateGroupFragment"
+    android:layout_gravity="center"
 
     >
 
-    <com.google.android.material.progressindicator.LinearProgressIndicator
-        android:id="@+id/ProgressIndicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
 
     <TextView
         android:id="@+id/textView2"
diff --git a/app/src/main/res/layout/fragment_group.xml b/app/src/main/res/layout/fragment_group.xml
index 66ab3e2..098de9e 100644
--- a/app/src/main/res/layout/fragment_group.xml
+++ b/app/src/main/res/layout/fragment_group.xml
@@ -2,32 +2,32 @@
 <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:id="@+id/GroupPage"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".GroupFragment"
     android:orientation="vertical"
-    android:padding="20dp">
-
+    android:padding="20dp"
+    tools:context=".GroupFragment">
 
 
     <androidx.cardview.widget.CardView
         android:id="@+id/Banner"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_width="314dp"
+        android:layout_height="53dp"
         android:layout_gravity="center"
         android:layout_margin="10dp"
-        android:layout_marginBottom="0dp"
+        android:layout_marginTop="8dp"
         app:cardBackgroundColor="@color/purple_700"
         app:cardCornerRadius="100dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintHorizontal_bias="0.494"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/GroupinformationList"
-        app:layout_constraintVertical_bias="1.0"
-        >
+        app:layout_constraintTop_toBottomOf="@+id/NoGroupinfo"
+        app:layout_constraintVertical_bias="0.924">
 
         <TextView
+            android:id="@+id/BannerText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -37,22 +37,48 @@
 
 
     </androidx.cardview.widget.CardView>
+
+    <TextView
+        android:id="@+id/NoGroupinfo"
+        android:layout_width="match_parent"
+        android:layout_height="531dp"
+        android:gravity="center"
+        android:text="TextView"
+        app:layout_constraintBottom_toBottomOf="@+id/GroupinformationList"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ListView
 
         android:id="@+id/GroupinformationList"
         android:layout_width="match_parent"
         android:layout_height="531dp"
+        android:clickable="true"
         android:divider="@android:color/transparent"
         android:dividerHeight="10.0sp"
-        android:clickable="true"
 
+        android:focusable="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:focusable="true" />
+        app:layout_constraintTop_toTopOf="parent">
 
 
+    </ListView>
+
+    <ImageView
+        android:id="@+id/refresh"
+        android:layout_width="35dp"
+        android:layout_height="37dp"
+        android:layout_marginEnd="12dp"
+        android:src="@drawable/refresh"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/Banner"
+        app:layout_constraintTop_toTopOf="@+id/Banner"
+        app:layout_constraintVertical_bias="0.231" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/groups_custom_dialog_box.xml b/app/src/main/res/layout/groups_custom_dialog_box.xml
index bccb7a6..dab6b4b 100644
--- a/app/src/main/res/layout/groups_custom_dialog_box.xml
+++ b/app/src/main/res/layout/groups_custom_dialog_box.xml
@@ -11,7 +11,6 @@
     android:layout_gravity="center"
     android:layout_margin="20dp"
     android:padding="20dp"
-    app:strokeColor="#808080"
     app:strokeWidth="@dimen/cardview_default_radius"
 
     >
@@ -98,6 +97,7 @@
             android:id="@+id/linearLayout2"
             android:layout_width="match_parent"
             android:layout_height="62dp"
+            android:gravity="center"
 
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -130,10 +130,18 @@
 
                     android:visibility="invisible" />
 
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/Chip4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Third User"
+                    android:visibility="invisible" />
+
             </TableRow>
         </TableLayout>
 
         <LinearLayout
+            android:id="@+id/linearLayout6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -145,23 +153,34 @@
             app:layout_constraintVertical_bias="0.077">
 
             <com.google.android.material.button.MaterialButton
+                android:id="@+id/StartChat"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:backgroundTint="#808080"
+                android:backgroundTint="@color/purple_700"
                 android:layout_marginEnd="10dp"
+                android:text="Start Chat" />
 
-                android:text="Email Group"
-                android:textColor="#FFFFFF"/>
-
-            <com.google.android.material.button.MaterialButton
+<!--            <com.google.android.material.button.MaterialButton
+                android:id="@+id/EmailInstructorBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:backgroundTint="#808080"
 
-                android:text="Email Group"
-                android:textColor="#FFFFFF" />
+
+                android:text="Email Instructor"
+                android:textColor="#FFFFFF" />-->
         </LinearLayout>
 
+        <ImageView
+
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/linearLayout6"
+            app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+            app:srcCompat="@android:drawable/sym_action_chat"
+            app:tint="@color/green"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/help_dialog_box.xml b/app/src/main/res/layout/help_dialog_box.xml
new file mode 100644
index 0000000..546ca0c
--- /dev/null
+++ b/app/src/main/res/layout/help_dialog_box.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<com.google.android.material.card.MaterialCardView
+
+    xmlns:tools="http://schemas.android.com/tools"
+    android:clickable="true"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_gravity="center"
+    android:layout_margin="20dp"
+    android:padding="20dp"
+    app:strokeWidth="@dimen/cardview_default_radius"
+
+    >
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:layout_margin="10dp">
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:src="@drawable/help_icon"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+        </ImageView>
+
+        <TextView
+            android:id="@+id/Help"
+            android:textFontWeight="700"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-black"
+            android:gravity="center"
+            android:text="How to use the app "
+            android:textStyle="bold"
+            android:textSize="30sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView2"
+            app:layout_constraintVertical_bias="0.051" />
+
+
+        <TextView
+            android:id="@+id/ViewGroupInstructor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="Classes Feature"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/Help"
+            app:layout_constraintVertical_bias="0.028" />
+
+        <TextView
+            android:id="@+id/AppointmentsTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textStyle="bold"
+
+            android:text="Appointments Feature "
+
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ViewGroupInstructor"
+            app:layout_constraintVertical_bias="0.158" />
+
+        <TextView
+            android:id="@+id/GroupsTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textStyle="bold"
+
+            android:text="Groups Feature "
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/AppointmentsTitle" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/GroupsParagraph"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/GroupsTitle"
+            app:layout_constraintVertical_bias="0.11"
+            android:gravity="left"
+            tools:layout_editor_absoluteX="-16dp" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/message_from_person.xml b/app/src/main/res/layout/message_from_person.xml
new file mode 100644
index 0000000..3f809da
--- /dev/null
+++ b/app/src/main/res/layout/message_from_person.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center">
+    <TextView
+        android:id="@+id/nameMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Me"
+        android:layout_gravity="end"
+        />
+    <androidx.cardview.widget.CardView
+        android:id="@+id/message_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        app:cardCornerRadius="70sp"
+        app:cardBackgroundColor="#1982FC">
+
+
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textColor="#FFFFFF"
+            android:gravity="center"
+            android:padding="10dp"
+            android:textAlignment="center"
+            android:text="TextView"
+            />
+
+    </androidx.cardview.widget.CardView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_from_user.xml b/app/src/main/res/layout/message_from_user.xml
new file mode 100644
index 0000000..5f2b9e0
--- /dev/null
+++ b/app/src/main/res/layout/message_from_user.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/nameMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Laurier Bot "
+        />
+    <androidx.cardview.widget.CardView
+        android:id="@+id/message_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        app:cardCornerRadius="70sp"
+        android:background="#808080"
+        app:cardBackgroundColor="#808080"
+        android:layout_marginBottom="4dp">
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textColor="#FFFFFF"
+            android:text="TextView"
+            android:padding="10dp"
+            android:gravity="center"
+            android:textAlignment="center"/>
+    </androidx.cardview.widget.CardView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 03c818e..c54a683 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,9 +2,33 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.example.android.MainActivity">
+
+
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never" />
+
+    <item
+        android:id="@+id/help"
+        android:icon="@drawable/help_icon"
+        android:orderInCategory="1"
+        app:showAsAction="always"
+        android:title="help"/>
+
+    <item
+        android:id="@+id/feedback"
+        android:orderInCategory="200"
+        app:showAsAction="never"
+        android:title="@string/feedback"
+        />
+
+    <item
+        android:id="@+id/Signout"
+        android:title="Sign out"
+        android:orderInCategory="300"
+        app:showAsAction="never"/>
+
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..7ad9ab1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="eggshell">#F0EAD6</color>
+    <color name="green"> #00FF00</color>
 </resources>
\ 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 caf7c0e..5263f57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,13 +4,14 @@
     <string name="title_activity_login">LoginActivity</string>
 
     <!--Login form strings-->
-    <string name="username_login_form">Username</string>
+    <string name="username_login_form">Email</string>
     <string name="password_login_form">Password</string>
-    <string name="username_login_form_hint">login name</string>
+    <string name="username_login_form_hint">login email</string>
     <string name="login_button_text">Sign In</string>
     <string name="go_to_register">Create a new account</string>
 
     <!--Login and Registration form error messages-->
+    <string name="banner_registration_page">Registration Page</string>
     <string name="psswrd_error_message">Please enter your password!</string>
     <string name="email_error_message">Please enter a valid email address!</string>
     <string name="regEx_psswrd_error_message">The password must be at least 8 characters and must include one digit, one lowercase character, one uppercase character, one special character, and one special character(!@#$%&amp;*()-+=^). No white spaces are allowed.</string>
@@ -51,11 +52,6 @@
         <item>400 Level</item>
     </string-array>
 
-    <string-array name="courses_list">
-        <item>None</item>
-        <item>CP470</item>
-        <item>CP468</item>
-    </string-array>
 
     <string name="proceed_button">Create Account</string>
     <string name="course_selection_button">Course Selection</string>
@@ -65,13 +61,42 @@
     <string name="forward"> -&gt; </string>
     <string name="backward"> &lt;- </string>
 
-    <string-array name="sudent_list">
-        <item> None </item>
-        <item> Carson Aziz</item>
-        <item> MaytheHateGuideYou</item>
-        <item> ThePharoah</item>
-        <item> Phis </item>
-    </string-array>
+    <!--  Create Groups Strings.xml uses -->
+
+    <string name="BannerRegistrationPage"> Groups Registration Page</string>
+    <string name="FormErr"> Err: Form is invalid, please make sure all fields are completed</string>
+    <!--  Create Groups String.xml  end  -->
+
+    <!--  Groups Fragment Strings.xml uses -->
+    <string name="Close"> Close </string>
+    <string name="EmailErr">You do not have an app that can send emails </string>
+    <string name="SaveButtonText"> Save </string>
+    <string name="ConfirmGroupReButton"> Are you sure you want to be removed from </string>
+    <string name="Yes"> Yes</string>
+    <string name="NoGroupsPage"> No groups available! </string>
+    <!--  Groups Fragment Strings.xml end  -->
+
+
+    <!-- Menu items Strings.xml Start -->
+    <string name="feedback"> Leave Feedback on app</string>
+    <string name="GroupsParagraph">The groups feature is the hub of where you can interact with other students in the same class as you. This can allow you to add fellow students across classes, organize you group and email your instructor or other group members.
+To get started you can click on the create a group button, this will take you to a user form to fill out all relevant information.
+        Once a group has been created, you can either edit your group, remove yourself from the group or check out more details by clicking on the group.
+
+    Feel free to explore around the Groups Feature!</string>
+    <!-- Menu items Strings.xml End  -->
+
+    <!-- Main Activity Strings.xml Start -->
+    <string name="Groups"> Groups</string>
+    <string name="Appointments"> Appointments</string>
+    <string name="Classes"> Classes</string>
+    <!-- Main Activity Strings.xml End -->
+
+
+    <!-- Class Fragment Strings.xml Start -->
+    <string name="noClassAdded"> You have no classes </string>
+
+    <!-- Class Fragment Strings.xml End-->
+
 
-    <string name="BannerRegistrationPage"> Groups registration page</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2d4f571..39471a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,6 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '7.2.2' apply false
+    id 'com.android.library' version '7.2.2' apply false
 }
\ No newline at end of file