diff --git a/.github/workflows/deploy_beta.yml b/.github/workflows/deploy_beta.yml
index d4b32150..00d939ed 100644
--- a/.github/workflows/deploy_beta.yml
+++ b/.github/workflows/deploy_beta.yml
@@ -29,6 +29,8 @@ jobs:
         with:
           channel: stable
           cache: true
+          cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
+          cache-path: '${{ runner.tool_cache }}/flutter/:channel:-:arch:'
 
       - if: matrix.platform == 'android'
         uses: actions/setup-java@v3
@@ -36,15 +38,10 @@ jobs:
           distribution: 'corretto'
           java-version: '17'
 
-      - name: Cache pub dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.FLUTTER_HOME }}/.pub-cache
-          key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }}
-          restore-keys: ${{ runner.os }}-pub-
-
       - name: Install Flutter Packages
-        run: flutter pub get
+        run: |
+          flutter config --no-analytics
+          flutter pub get
 
       - if: matrix.platform == 'ios'
         name: Install CocoaPods
diff --git a/.github/workflows/lint_test_build.yml b/.github/workflows/lint_test_build.yml
index 8c2a5432..afadfb02 100644
--- a/.github/workflows/lint_test_build.yml
+++ b/.github/workflows/lint_test_build.yml
@@ -35,5 +35,5 @@ jobs:
       - name: Run Tests
         run: flutter test
 
-      - name: Build Project
+      - name: Build Project for iOS
         run: flutter build ipa --no-codesign
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 5f34e163..6df88d5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@ app.*.map.json
 
 ios/fastlane/report.xml
 ios/fastlane/README.md
+
+desiredFileName.txt
diff --git a/README.md b/README.md
index 37c4b227..437a50d6 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@ This mobile client for [gocast](https://github.com/TUM-Dev/gocast) is currently
 
 - [x] Authentication using internal account
 - [x] Authentication using TUM SSO
-- [ ] Overview of own and publicly available Lectures
-- [ ] Ability to watch lectures (single, multi - view and split - view)
-- [ ] Bookmark lectures
-- [ ] Automatic notifications if lecture starts
-- [ ] Ability to search for lectures
-- [ ] Ability to download lectures in a data privacy conform manner (non - exportable and remotely deletable)
+- [x] Overview of own and publicly available Lectures
+- [x] Ability to watch lectures (single, multi - view and split - view)
+- [x] Pin lectures
+- [x] Automatic notifications if course goes live starts and if new lecture VoD is uploaded 
+- [x] Ability to search for lectures
+- [x] Ability to download lectures in a data privacy conform manner (non - exportable and remotely deletable)
 - [ ] Ability to answer quizzes and feedback requests
 
 ## Config
@@ -28,4 +28,8 @@ This mobile client for [gocast](https://github.com/TUM-Dev/gocast) is currently
 | Dependency                               | Usage                                    | Where to download it                         |
 |------------------------------------------|------------------------------------------|----------------------------------------------|
 | `Flutter` (includes the `Dart` compiler) | SDK to develop this app                  | https://docs.flutter.dev/get-started/install |
-| A local instance of [`gocast`](https://github.com/tum-dev/gocast) | API to fetch user data & streams                  | https://github.com/TUM-Dev/gocast#readme |
\ No newline at end of file
+| A local instance of [`gocast`](https://github.com/tum-dev/gocast) | API to fetch user data & streams                  | https://github.com/TUM-Dev/gocast#readme |
+
+## Push notifications
+
+For the push notifications, gocast_mobile uses the Firebase Cloudmessaging API. For more details and a detailed setup instruction, see [gocast FCM guide](https://gist.github.com/carlobortolan/845141e175c2f43135b3893670f99c59).
diff --git a/android/app/google-services.json b/android/app/google-services.json
new file mode 100644
index 00000000..5301f6b4
--- /dev/null
+++ b/android/app/google-services.json
@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "1098592064630",
+    "project_id": "ipraktikum-v1",
+    "storage_bucket": "ipraktikum-v1.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1098592064630:android:fa116290547c8adf03fb57",
+        "android_client_info": {
+          "package_name": "de.tum.gocast"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCCbpYL8mGCkRD0CZG7bv5WmaNZP67Yxto"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 75afe80e..b684550e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <application
         android:label="gocast_mobile"
         android:name="${applicationName}"
@@ -24,6 +25,8 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="de.tum.gocast_mobile" /> 
+                <action android:name="FLUTTER_NOTIFICATION_CLICK" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index d2526f19..c6a35ab5 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 644be7a9..b77413f3 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09535180..f830cd84 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 087802eb..c16f1167 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index f683694b..560801c0 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/build.gradle b/android/build.gradle
index f7eb7f63..4da596e4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,6 +7,9 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.0'
+        // START: FlutterFire Configuration
+        classpath 'com.google.gms:google-services:4.3.14'
+        // END: FlutterFire Configuration
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/assets/images/appicon.png b/assets/images/appicon.png
new file mode 100644
index 00000000..fcae2c23
Binary files /dev/null and b/assets/images/appicon.png differ
diff --git a/assets/images/img.png b/assets/images/img.png
new file mode 100644
index 00000000..bd44112b
Binary files /dev/null and b/assets/images/img.png differ
diff --git a/assets/images/logo.png b/assets/images/logo.png
index 5ef04459..ce83ae85 100644
Binary files a/assets/images/logo.png and b/assets/images/logo.png differ
diff --git a/assets/sample.mp4 b/assets/sample.mp4
new file mode 100644
index 00000000..9e9d26e2
Binary files /dev/null and b/assets/sample.mp4 differ
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 9625e105..7c569640 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
index fdcc671e..164df534 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1181d116..ba56f268 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,4 +1,39 @@
 PODS:
+  - connectivity_plus (0.0.1):
+    - Flutter
+    - ReachabilitySwift
+  - Firebase/CoreOnly (10.18.0):
+    - FirebaseCore (= 10.18.0)
+  - Firebase/Messaging (10.18.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 10.18.0)
+  - firebase_core (2.24.2):
+    - Firebase/CoreOnly (= 10.18.0)
+    - Flutter
+  - firebase_messaging (14.7.10):
+    - Firebase/Messaging (= 10.18.0)
+    - firebase_core
+    - Flutter
+  - FirebaseCore (10.18.0):
+    - FirebaseCoreInternal (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.12)
+    - GoogleUtilities/Logger (~> 7.12)
+  - FirebaseCoreInternal (10.20.0):
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+  - FirebaseInstallations (10.20.0):
+    - FirebaseCore (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - PromisesObjC (~> 2.1)
+  - FirebaseMessaging (10.18.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Reachability (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
   - Flutter (1.0.0)
   - flutter_inappwebview (0.0.1):
     - Flutter
@@ -9,57 +44,142 @@ PODS:
     - OrderedSet (~> 5.0)
   - flutter_secure_storage (6.0.0):
     - Flutter
+  - GoogleDataTransport (9.3.0):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/AppDelegateSwizzler (7.12.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (7.12.0):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.12.0):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/Network (7.12.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (7.12.0)"
+  - GoogleUtilities/Reachability (7.12.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/UserDefaults (7.12.0):
+    - GoogleUtilities/Logger
+  - nanopb (2.30909.1):
+    - nanopb/decode (= 2.30909.1)
+    - nanopb/encode (= 2.30909.1)
+  - nanopb/decode (2.30909.1)
+  - nanopb/encode (2.30909.1)
   - OrderedSet (5.0.0)
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - PromisesObjC (2.3.1)
+  - ReachabilitySwift (5.0.0)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
   - uni_links (0.0.1):
     - Flutter
+  - url_launcher_ios (0.0.1):
+    - Flutter
+  - video_player_avfoundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - wakelock_plus (0.0.1):
+    - Flutter
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
 
 DEPENDENCIES:
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
   - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
 
 SPEC REPOS:
   trunk:
+    - Firebase
+    - FirebaseCore
+    - FirebaseCoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
+    - GoogleDataTransport
+    - GoogleUtilities
+    - nanopb
     - OrderedSet
+    - PromisesObjC
+    - ReachabilitySwift
 
 EXTERNAL SOURCES:
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
+  firebase_core:
+    :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_messaging:
+    :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
   flutter_inappwebview:
     :path: ".symlinks/plugins/flutter_inappwebview/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+  video_player_avfoundation:
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
   webview_flutter_wkwebview:
     :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
+  Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06
+  firebase_core: 0af4a2b24f62071f9bf283691c0ee41556dcb3f5
+  firebase_messaging: 90e8a6db84b6e1e876cebce4f30f01dc495e7014
+  FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f
+  FirebaseCoreInternal: efeeb171ac02d623bdaefe121539939821e10811
+  FirebaseInstallations: 558b1da7d65afeb996fd5c814332f013234ece4e
+  FirebaseMessaging: 9bc34a98d2e0237e1b121915120d4d48ddcf301e
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
+  GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+  nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
+  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
+  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
 
-PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189
+PODFILE CHECKSUM: 7be2f5f74864d463a8ad433546ed1de7e0f29aef
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.0
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 598bcc39..db042420 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -10,12 +10,12 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		62D1E46B709B2778DF31DFAE /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EADC4D86CCF5F2DFEEC652C6 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		802D8839F599B1F959934A1D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD17F8647ECF9A56D2F9859D /* Pods_RunnerTests.framework */; };
+		86B5DAAFB0220E177439FF31 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B775987C01F5E391C600A30F /* Pods_Runner.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		E6F9F153083F25BE411AB644 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 775B1A9CB7B837FAE87A34D7 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,18 +42,17 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0C7BDB05D2D09BAF54CECA37 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		1B89595BA32A90DA5A260150 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		201AF003F1D58C8A2BDB6066 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		300E5FB3FBC5CD97F4D031B0 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		287374D32B6D5A1900113A88 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		46DD409E6BE2D0D6853CC1BA /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		4E66554891BFAEC9BDB682C7 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		531A2EC852B38B5C8B4EA5E7 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		775B1A9CB7B837FAE87A34D7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -62,9 +61,11 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		9A07DE4E2D6CC316FEC35B35 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		BD17F8647ECF9A56D2F9859D /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		E7353067ADE023F80892FF94 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		B64C4C5BC3480AB88DC7494F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		B775987C01F5E391C600A30F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D52501E50B2494E602F53E14 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		DDBE2944B9CF9749C9AC162E /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		EADC4D86CCF5F2DFEEC652C6 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -72,7 +73,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6F9F153083F25BE411AB644 /* Pods_Runner.framework in Frameworks */,
+				86B5DAAFB0220E177439FF31 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -80,7 +81,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				802D8839F599B1F959934A1D /* Pods_RunnerTests.framework in Frameworks */,
+				62D1E46B709B2778DF31DFAE /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -98,21 +99,21 @@
 		78FEB0DCF6A80DA53C445FF1 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				201AF003F1D58C8A2BDB6066 /* Pods-Runner.debug.xcconfig */,
-				1B89595BA32A90DA5A260150 /* Pods-Runner.release.xcconfig */,
-				E7353067ADE023F80892FF94 /* Pods-Runner.profile.xcconfig */,
-				9A07DE4E2D6CC316FEC35B35 /* Pods-RunnerTests.debug.xcconfig */,
-				300E5FB3FBC5CD97F4D031B0 /* Pods-RunnerTests.release.xcconfig */,
-				0C7BDB05D2D09BAF54CECA37 /* Pods-RunnerTests.profile.xcconfig */,
+				D52501E50B2494E602F53E14 /* Pods-Runner.debug.xcconfig */,
+				4E66554891BFAEC9BDB682C7 /* Pods-Runner.release.xcconfig */,
+				B64C4C5BC3480AB88DC7494F /* Pods-Runner.profile.xcconfig */,
+				DDBE2944B9CF9749C9AC162E /* Pods-RunnerTests.debug.xcconfig */,
+				46DD409E6BE2D0D6853CC1BA /* Pods-RunnerTests.release.xcconfig */,
+				531A2EC852B38B5C8B4EA5E7 /* Pods-RunnerTests.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		8464D627BCAF342886960CC6 /* Frameworks */ = {
+		912CD9F350CD6EDE40745239 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				775B1A9CB7B837FAE87A34D7 /* Pods_Runner.framework */,
-				BD17F8647ECF9A56D2F9859D /* Pods_RunnerTests.framework */,
+				B775987C01F5E391C600A30F /* Pods_Runner.framework */,
+				EADC4D86CCF5F2DFEEC652C6 /* Pods_RunnerTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -136,7 +137,7 @@
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				78FEB0DCF6A80DA53C445FF1 /* Pods */,
-				8464D627BCAF342886960CC6 /* Frameworks */,
+				912CD9F350CD6EDE40745239 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -152,6 +153,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				287374D32B6D5A1900113A88 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -171,7 +173,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				CE72DBDBDE0F0117AD18EDA1 /* [CP] Check Pods Manifest.lock */,
+				03E03872344339D02E9C1445 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
 				FF22FF673DB1C30D7D5D59A8 /* Frameworks */,
@@ -190,14 +192,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				7DADE08A74ACA37AB14483AD /* [CP] Check Pods Manifest.lock */,
+				F4970B688A0057C32C3283C1 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				BDDC2DEC4E39370FFD9AA064 /* [CP] Embed Pods Frameworks */,
+				11D2E05FEFDA3F77A431400B /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -269,77 +271,77 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		03E03872344339D02E9C1445 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "Thin Binary";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
 		};
-		7DADE08A74ACA37AB14483AD /* [CP] Check Pods Manifest.lock */ = {
+		11D2E05FEFDA3F77A431400B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
-			name = "Run Script";
+			name = "Thin Binary";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		BDDC2DEC4E39370FFD9AA064 /* [CP] Embed Pods Frameworks */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			name = "Run Script";
+			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		CE72DBDBDE0F0117AD18EDA1 /* [CP] Check Pods Manifest.lock */ = {
+		F4970B688A0057C32C3283C1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -354,7 +356,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -415,6 +417,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -434,6 +437,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -466,6 +470,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -480,15 +485,19 @@
 				PRODUCT_BUNDLE_IDENTIFIER = de.tum.cit.ase.ios2324.tum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9A07DE4E2D6CC316FEC35B35 /* Pods-RunnerTests.debug.xcconfig */;
+			baseConfigurationReference = DDBE2944B9CF9749C9AC162E /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -506,7 +515,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 300E5FB3FBC5CD97F4D031B0 /* Pods-RunnerTests.release.xcconfig */;
+			baseConfigurationReference = 46DD409E6BE2D0D6853CC1BA /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -522,7 +531,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0C7BDB05D2D09BAF54CECA37 /* Pods-RunnerTests.profile.xcconfig */;
+			baseConfigurationReference = 531A2EC852B38B5C8B4EA5E7 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -540,6 +549,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -559,6 +569,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -594,6 +605,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -613,6 +625,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -647,6 +660,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -661,9 +675,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = de.tum.cit.ase.ios2324.tum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -674,6 +692,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -688,8 +707,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = de.tum.cit.ase.ios2324.tum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png
index c3761206..56ae9165 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
index 273cdd5b..ce83ae85 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
index 45ee2475..b9d02cb5 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
index 98bdafd8..22db8ff8 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png
index 087802eb..c16f1167 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png
index d1a15aa6..9af3bc7e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png
index 463bf80e..18b82c2f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
index a7967384..6431cb04 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
index 70093392..18dfe7d4 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
index c1dd8f10..5f8ad643 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
index c7e66f89..2c2fcebf 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png
index 39bbddfa..5fe38980 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
index e4086ae9..f2acd485 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
index d9b23b05..116b7b55 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
index bd135f61..76a862f3 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png
index d2526f19..c6a35ab5 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
index 1afe9c8a..758da054 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
index 6b4f272f..ea28de02 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
index 4c222630..544a0eb9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist
new file mode 100644
index 00000000..1fddb881
--- /dev/null
+++ b/ios/Runner/GoogleService-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyDx6M88HdUC4YfxZK8A4UxwM-AucYrpCe8</string>
+	<key>GCM_SENDER_ID</key>
+	<string>1098592064630</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>de.tum.cit.ase.ios2324.tum</string>
+	<key>PROJECT_ID</key>
+	<string>ipraktikum-v1</string>
+	<key>STORAGE_BUCKET</key>
+	<string>ipraktikum-v1.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:1098592064630:ios:0e47f83fa095cedb03fb57</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 0be50881..fdc5768a 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -22,6 +22,19 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>gocast</string>
+			</array>
+		</dict>
+	</array>
+	<key>LSApplicationQueriesSchemes</key>
+    <array>
+      <string>https</string>
+    </array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -35,6 +48,7 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
@@ -45,15 +59,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>gocast</string>
-			</array>
-   	 </dict>
-	</array>
-
 </dict>
 </plist>
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..903def2a
--- /dev/null
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 85bf47c4..167947e7 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -20,7 +20,7 @@ platform :ios do
       skip_certificate_matching: true
     )
 
-    previous_build_number = latest_testflight_build_number
+    previous_build_number = latest_testflight_build_number(version: "#{get_version_number}", initial_build_number: 0, app_identifier: "de.tum.cit.ase.ios2324.tum")
 
     current_build_number = previous_build_number + 1
 
diff --git a/ios/firebase_app_id_file.json b/ios/firebase_app_id_file.json
new file mode 100644
index 00000000..4c208f8f
--- /dev/null
+++ b/ios/firebase_app_id_file.json
@@ -0,0 +1,7 @@
+{
+  "file_generated_by": "FlutterFire CLI",
+  "purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
+  "GOOGLE_APP_ID": "1:1098592064630:ios:0e47f83fa095cedb03fb57",
+  "FIREBASE_PROJECT_ID": "ipraktikum-v1",
+  "GCM_SENDER_ID": "1098592064630"
+}
\ No newline at end of file
diff --git a/l10n.yaml b/l10n.yaml
new file mode 100644
index 00000000..dbaf35b5
--- /dev/null
+++ b/l10n.yaml
@@ -0,0 +1,4 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart
+untranslated-messages-file: desiredFileName.txt
diff --git a/lib/base/helpers/model_generator.dart b/lib/base/helpers/model_generator.dart
deleted file mode 100644
index e66ef69a..00000000
--- a/lib/base/helpers/model_generator.dart
+++ /dev/null
@@ -1,91 +0,0 @@
-/// A ModelGenerator class for generating mock data models.
-///
-/// This class provides methods to generate random instances of various
-/// models like User, Course, UserSetting, and Bookmark for testing and
-/// development purposes.
-///
-/// Deprecated: This class is no longer used in the application.
-library;
-
-import 'dart:math';
-
-import '../networking/api/gocast/api_v2.pb.dart';
-
-/// Deprecated: This class is no longer used in the application.
-///
-/// A ModelGenerator class for generating mock data models.
-class ModelGenerator {
-  static final _random = Random();
-
-  /// Generate a random unique ID
-  static int _uniqueId() => _random.nextInt(10000);
-
-  /// Generate a random course
-  static Course _generateRandomCourse(int index) {
-    return Course(
-      id: _uniqueId(),
-      name: 'Course$index',
-    );
-  }
-
-  /// Generate a random user setting
-  static UserSetting _generateRandomUserSetting(int index) {
-    return UserSetting(
-      id: _uniqueId(),
-      userID: _uniqueId(),
-      type: UserSettingType
-          .values[_random.nextInt(UserSettingType.values.length)],
-      value: 'Value$index',
-    );
-  }
-
-  /// Generate a random bookmark
-  static Bookmark _generateRandomBookmark(int userId, int index) {
-    return Bookmark(
-      id: _uniqueId(),
-      userID: userId,
-      description: 'Bookmark $index',
-      hours: _random.nextInt(24),
-      minutes: _random.nextInt(60),
-      seconds: _random.nextInt(60),
-      streamID: _random.nextInt(100),
-    );
-  }
-
-  /// Generate a random user
-  static User generateRandomUser() {
-    final id = _uniqueId();
-    final name = 'User$id';
-    final lastName = 'Last$id';
-    final email = '$name.$lastName@example.com';
-    final matriculationNumber = 'M$id';
-    final lrzId = 'L$id';
-    final role = _random.nextInt(3) + 1;
-    final courses =
-        List.generate(_random.nextInt(5) + 1, _generateRandomCourse);
-    final administeredCourses =
-        List.generate(_random.nextInt(3) + 1, _generateRandomCourse);
-    final pinnedCourses =
-        List.generate(_random.nextInt(3) + 1, _generateRandomCourse);
-    final settings =
-        List.generate(_random.nextInt(3) + 1, _generateRandomUserSetting);
-    final bookmarks = List.generate(
-      _random.nextInt(3) + 1,
-      (index) => _generateRandomBookmark(id, index),
-    );
-    return User(
-      id: id,
-      name: name,
-      lastName: lastName,
-      email: email,
-      matriculationNumber: matriculationNumber,
-      lrzID: lrzId,
-      role: role,
-      courses: courses,
-      administeredCourses: administeredCourses,
-      pinnedCourses: pinnedCourses,
-      settings: settings,
-      bookmarks: bookmarks,
-    );
-  }
-}
diff --git a/lib/base/networking/README.md b/lib/base/networking/README.md
index 816dd29a..5d115e33 100644
--- a/lib/base/networking/README.md
+++ b/lib/base/networking/README.md
@@ -4,7 +4,7 @@ The `api` directory contains handlers like `api_handler.dart`, `auth_handler.dar
 The `api/gocast` directory contains protobuf files for the GoCast API, and the `api/google` directory contains protobuf files for Google's well-known types. These protobuf files are used by the `grpc_handler.dart` to make API calls._
 
 
-> __NOTE__: _Currently using HTTP for the login, but ideally all other endpoints are called using gRPC. To get an idea how this looks like and what the endpoint definitions are check out our ***[Postman Collection](https://documenter.getpostman.com/view/31343920/2s9YeBdszX)*** and out current ***[protofile](https://github.com/TUM-Dev/gocast/blob/IPraktikum-dev/api_v2/api_v2.proto)***._
+> __NOTE__: _Currently using HTTP for the login, but ideally all other endpoints are called using gRPC. To get an idea how this looks like and what the endpoint definitions are check out our ***[Postman Collection](https://www.postman.com/tumdev/workspace/team-workspace/collection/6560b05347e9207e30ae90d3)*** and our current ***[protofile](https://github.com/TUM-Dev/gocast/blob/IPraktikum-dev/api_v2/api_v2.proto)***._
 
 # Setup
 
@@ -19,7 +19,7 @@ brew install grpc protobuf
 ```
 dart pub global activate protoc_plugin
 export PATH="$PATH:$HOME/.pub-cache/bin"
-curl -o proto/gocast/api_v2.proto https://raw.githubusercontent.com/TUM-Dev/gocast/IPraktikum-36-user-endpoints/api_v2/api_v2.proto
+curl -o proto/gocast/api_v2.proto https://raw.githubusercontent.com/TUM-Dev/gocast/IPraktikum-dev/api_v2/api_v2.proto
 protoc --dart_out=grpc:lib/base/networking/api -I./proto google/protobuf/timestamp.proto google/protobuf/empty.proto proto/gocast/api_v2.proto 
 ```
 
diff --git a/lib/base/networking/api/gocast/api_v2.pb.dart b/lib/base/networking/api/gocast/api_v2.pb.dart
index 6bd77716..fe76f766 100644
--- a/lib/base/networking/api/gocast/api_v2.pb.dart
+++ b/lib/base/networking/api/gocast/api_v2.pb.dart
@@ -11,7 +11,6 @@
 
 import 'dart:core' as $core;
 
-import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../google/protobuf/timestamp.pb.dart' as $1;
@@ -19,1692 +18,7918 @@ import 'api_v2.pbenum.dart';
 
 export 'api_v2.pbenum.dart';
 
-class User extends $pb.GeneratedMessage {
-  factory User({
-    $core.int? id,
-    $core.String? name,
-    $core.String? lastName,
-    $core.String? email,
-    $core.String? matriculationNumber,
-    $core.String? lrzID,
-    $core.int? role,
-    $core.Iterable<Course>? courses,
-    $core.Iterable<Course>? administeredCourses,
-    $core.Iterable<Course>? pinnedCourses,
-    $core.Iterable<UserSetting>? settings,
-    $core.Iterable<Bookmark>? bookmarks,
+class ChatReaction extends $pb.GeneratedMessage {
+  factory ChatReaction({
+    $core.int? chatID,
+    $core.int? userID,
+    $core.String? username,
+    $core.String? emoji,
   }) {
     final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    if (lastName != null) {
-      $result.lastName = lastName;
-    }
-    if (email != null) {
-      $result.email = email;
-    }
-    if (matriculationNumber != null) {
-      $result.matriculationNumber = matriculationNumber;
-    }
-    if (lrzID != null) {
-      $result.lrzID = lrzID;
+    if (chatID != null) {
+      $result.chatID = chatID;
     }
-    if (role != null) {
-      $result.role = role;
-    }
-    if (courses != null) {
-      $result.courses.addAll(courses);
-    }
-    if (administeredCourses != null) {
-      $result.administeredCourses.addAll(administeredCourses);
-    }
-    if (pinnedCourses != null) {
-      $result.pinnedCourses.addAll(pinnedCourses);
+    if (userID != null) {
+      $result.userID = userID;
     }
-    if (settings != null) {
-      $result.settings.addAll(settings);
+    if (username != null) {
+      $result.username = username;
     }
-    if (bookmarks != null) {
-      $result.bookmarks.addAll(bookmarks);
+    if (emoji != null) {
+      $result.emoji = emoji;
     }
     return $result;
   }
-  User._() : super();
-  factory User.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory User.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'User', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..aOS(3, _omitFieldNames ? '' : 'lastName', protoName: 'lastName')
-    ..aOS(4, _omitFieldNames ? '' : 'email')
-    ..aOS(5, _omitFieldNames ? '' : 'matriculationNumber', protoName: 'matriculationNumber')
-    ..aOS(6, _omitFieldNames ? '' : 'lrzID', protoName: 'lrzID')
-    ..a<$core.int>(7, _omitFieldNames ? '' : 'role', $pb.PbFieldType.OU3)
-    ..pc<Course>(8, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM, subBuilder: Course.create)
-    ..pc<Course>(9, _omitFieldNames ? '' : 'administeredCourses', $pb.PbFieldType.PM, protoName: 'administeredCourses', subBuilder: Course.create)
-    ..pc<Course>(10, _omitFieldNames ? '' : 'pinnedCourses', $pb.PbFieldType.PM, protoName: 'pinnedCourses', subBuilder: Course.create)
-    ..pc<UserSetting>(11, _omitFieldNames ? '' : 'settings', $pb.PbFieldType.PM, subBuilder: UserSetting.create)
-    ..pc<Bookmark>(12, _omitFieldNames ? '' : 'bookmarks', $pb.PbFieldType.PM, subBuilder: Bookmark.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  User clone() => User()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  User copyWith(void Function(User) updates) => super.copyWith((message) => updates(message as User)) as User;
+  ChatReaction._() : super();
+
+  factory ChatReaction.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory ChatReaction.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'ChatReaction',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'chatID', $pb.PbFieldType.OU3,
+      protoName: 'chatID',
+    )
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'userID', $pb.PbFieldType.OU3,
+      protoName: 'userID',
+    )
+    ..aOS(3, _omitFieldNames ? '' : 'username')
+    ..aOS(4, _omitFieldNames ? '' : 'emoji')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  ChatReaction clone() => ChatReaction()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  ChatReaction copyWith(void Function(ChatReaction) updates) =>
+      super.copyWith((message) => updates(message as ChatReaction))
+          as ChatReaction;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static User create() => User._();
-  User createEmptyInstance() => create();
-  static $pb.PbList<User> createRepeated() => $pb.PbList<User>();
+  static ChatReaction create() => ChatReaction._();
+  ChatReaction createEmptyInstance() => create();
+
+  static $pb.PbList<ChatReaction> createRepeated() =>
+      $pb.PbList<ChatReaction>();
   @$core.pragma('dart2js:noInline')
-  static User getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<User>(create);
-  static User? _defaultInstance;
+  static ChatReaction getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<ChatReaction>(create);
+  static ChatReaction? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.int get id => $_getIZ(0);
+  $core.int get chatID => $_getIZ(0);
   @$pb.TagNumber(1)
-  set id($core.int v) { $_setUnsignedInt32(0, v); }
+  set chatID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
+  $core.bool hasChatID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  void clearChatID() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
+  $core.int get userID => $_getIZ(1);
   @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
+  set userID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
+  $core.bool hasUserID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearUserID() => clearField(2);
 
   @$pb.TagNumber(3)
-  $core.String get lastName => $_getSZ(2);
+  $core.String get username => $_getSZ(2);
   @$pb.TagNumber(3)
-  set lastName($core.String v) { $_setString(2, v); }
+  set username($core.String v) {
+    $_setString(2, v);
+  }
+
   @$pb.TagNumber(3)
-  $core.bool hasLastName() => $_has(2);
+  $core.bool hasUsername() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLastName() => clearField(3);
+  void clearUsername() => clearField(3);
 
   @$pb.TagNumber(4)
-  $core.String get email => $_getSZ(3);
+  $core.String get emoji => $_getSZ(3);
   @$pb.TagNumber(4)
-  set email($core.String v) { $_setString(3, v); }
+  set emoji($core.String v) {
+    $_setString(3, v);
+  }
+
   @$pb.TagNumber(4)
-  $core.bool hasEmail() => $_has(3);
+  $core.bool hasEmoji() => $_has(3);
   @$pb.TagNumber(4)
-  void clearEmail() => clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.String get matriculationNumber => $_getSZ(4);
-  @$pb.TagNumber(5)
-  set matriculationNumber($core.String v) { $_setString(4, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasMatriculationNumber() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearMatriculationNumber() => clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.String get lrzID => $_getSZ(5);
-  @$pb.TagNumber(6)
-  set lrzID($core.String v) { $_setString(5, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasLrzID() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearLrzID() => clearField(6);
-
-  @$pb.TagNumber(7)
-  $core.int get role => $_getIZ(6);
-  @$pb.TagNumber(7)
-  set role($core.int v) { $_setUnsignedInt32(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasRole() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearRole() => clearField(7);
-
-  @$pb.TagNumber(8)
-  $core.List<Course> get courses => $_getList(7);
-
-  @$pb.TagNumber(9)
-  $core.List<Course> get administeredCourses => $_getList(8);
-
-  @$pb.TagNumber(10)
-  $core.List<Course> get pinnedCourses => $_getList(9);
-
-  @$pb.TagNumber(11)
-  $core.List<UserSetting> get settings => $_getList(10);
-
-  @$pb.TagNumber(12)
-  $core.List<Bookmark> get bookmarks => $_getList(11);
+  void clearEmoji() => clearField(4);
 }
 
-class UserSetting extends $pb.GeneratedMessage {
-  factory UserSetting({
+class AddressedUser extends $pb.GeneratedMessage {
+  factory AddressedUser({
     $core.int? id,
-    $core.int? userID,
-    UserSettingType? type,
-    $core.String? value,
+    $core.String? username,
   }) {
     final $result = create();
     if (id != null) {
       $result.id = id;
     }
-    if (userID != null) {
-      $result.userID = userID;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (value != null) {
-      $result.value = value;
+    if (username != null) {
+      $result.username = username;
     }
     return $result;
   }
-  UserSetting._() : super();
-  factory UserSetting.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory UserSetting.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UserSetting', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
+  AddressedUser._() : super();
+
+  factory AddressedUser.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory AddressedUser.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'AddressedUser',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
     ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'userID', $pb.PbFieldType.OU3, protoName: 'userID')
-    ..e<UserSettingType>(3, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: UserSettingType.PREFERRED_NAME, valueOf: UserSettingType.valueOf, enumValues: UserSettingType.values)
-    ..aOS(4, _omitFieldNames ? '' : 'value')
-    ..hasRequiredFields = false
-  ;
+    ..aOS(2, _omitFieldNames ? '' : 'username')
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  UserSetting clone() => UserSetting()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  UserSetting copyWith(void Function(UserSetting) updates) => super.copyWith((message) => updates(message as UserSetting)) as UserSetting;
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  AddressedUser clone() => AddressedUser()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  AddressedUser copyWith(void Function(AddressedUser) updates) =>
+      super.copyWith((message) => updates(message as AddressedUser))
+          as AddressedUser;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static UserSetting create() => UserSetting._();
-  UserSetting createEmptyInstance() => create();
-  static $pb.PbList<UserSetting> createRepeated() => $pb.PbList<UserSetting>();
+  static AddressedUser create() => AddressedUser._();
+  AddressedUser createEmptyInstance() => create();
+
+  static $pb.PbList<AddressedUser> createRepeated() =>
+      $pb.PbList<AddressedUser>();
   @$core.pragma('dart2js:noInline')
-  static UserSetting getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<UserSetting>(create);
-  static UserSetting? _defaultInstance;
+  static AddressedUser getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<AddressedUser>(create);
+  static AddressedUser? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get id => $_getIZ(0);
   @$pb.TagNumber(1)
-  set id($core.int v) { $_setUnsignedInt32(0, v); }
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasId() => $_has(0);
   @$pb.TagNumber(1)
   void clearId() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.int get userID => $_getIZ(1);
+  $core.String get username => $_getSZ(1);
   @$pb.TagNumber(2)
-  set userID($core.int v) { $_setUnsignedInt32(1, v); }
+  set username($core.String v) {
+    $_setString(1, v);
+  }
+
   @$pb.TagNumber(2)
-  $core.bool hasUserID() => $_has(1);
+  $core.bool hasUsername() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUserID() => clearField(2);
-
-  @$pb.TagNumber(3)
-  UserSettingType get type => $_getN(2);
-  @$pb.TagNumber(3)
-  set type(UserSettingType v) { setField(3, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasType() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearType() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.String get value => $_getSZ(3);
-  @$pb.TagNumber(4)
-  set value($core.String v) { $_setString(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasValue() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearValue() => clearField(4);
-}
-
-class GetUserRequest extends $pb.GeneratedMessage {
-  factory GetUserRequest() => create();
-  GetUserRequest._() : super();
-  factory GetUserRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserRequest clone() => GetUserRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserRequest copyWith(void Function(GetUserRequest) updates) => super.copyWith((message) => updates(message as GetUserRequest)) as GetUserRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static GetUserRequest create() => GetUserRequest._();
-  GetUserRequest createEmptyInstance() => create();
-  static $pb.PbList<GetUserRequest> createRepeated() => $pb.PbList<GetUserRequest>();
-  @$core.pragma('dart2js:noInline')
-  static GetUserRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserRequest>(create);
-  static GetUserRequest? _defaultInstance;
+  void clearUsername() => clearField(2);
 }
 
-class GetUserCoursesRequest extends $pb.GeneratedMessage {
-  factory GetUserCoursesRequest({
-    $core.int? year,
-    $core.String? term,
-    $core.String? query,
-    $core.int? limit,
-    $core.int? skip,
+class ChatMessage extends $pb.GeneratedMessage {
+  factory ChatMessage({
+    $core.int? id,
+    $core.String? userID,
+    $core.String? username,
+    $core.String? message,
+    $core.String? sanitizedMessage,
+    $core.int? streamID,
+    $core.String? color,
+    $core.bool? isVisible,
+    $core.Iterable<ChatReaction>? reactions,
+    $core.Iterable<ChatMessage>? replies,
+    $core.Iterable<AddressedUser>? addressedUsers,
+    $core.bool? isResolved,
+    $1.Timestamp? createdAt,
+    $core.bool? isAdmin,
   }) {
     final $result = create();
-    if (year != null) {
-      $result.year = year;
+    if (id != null) {
+      $result.id = id;
     }
-    if (term != null) {
-      $result.term = term;
+    if (userID != null) {
+      $result.userID = userID;
     }
-    if (query != null) {
-      $result.query = query;
+    if (username != null) {
+      $result.username = username;
     }
-    if (limit != null) {
-      $result.limit = limit;
+    if (message != null) {
+      $result.message = message;
     }
-    if (skip != null) {
-      $result.skip = skip;
+    if (sanitizedMessage != null) {
+      $result.sanitizedMessage = sanitizedMessage;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    if (color != null) {
+      $result.color = color;
+    }
+    if (isVisible != null) {
+      $result.isVisible = isVisible;
+    }
+    if (reactions != null) {
+      $result.reactions.addAll(reactions);
+    }
+    if (replies != null) {
+      $result.replies.addAll(replies);
+    }
+    if (addressedUsers != null) {
+      $result.addressedUsers.addAll(addressedUsers);
+    }
+    if (isResolved != null) {
+      $result.isResolved = isResolved;
+    }
+    if (createdAt != null) {
+      $result.createdAt = createdAt;
+    }
+    if (isAdmin != null) {
+      $result.isAdmin = isAdmin;
     }
     return $result;
   }
-  GetUserCoursesRequest._() : super();
-  factory GetUserCoursesRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserCoursesRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserCoursesRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'year', $pb.PbFieldType.O3)
-    ..aOS(2, _omitFieldNames ? '' : 'term')
-    ..aOS(3, _omitFieldNames ? '' : 'query')
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'limit', $pb.PbFieldType.O3)
-    ..a<$core.int>(5, _omitFieldNames ? '' : 'skip', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserCoursesRequest clone() => GetUserCoursesRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserCoursesRequest copyWith(void Function(GetUserCoursesRequest) updates) => super.copyWith((message) => updates(message as GetUserCoursesRequest)) as GetUserCoursesRequest;
+  ChatMessage._() : super();
+
+  factory ChatMessage.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory ChatMessage.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'ChatMessage',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'userID', protoName: 'userID')
+    ..aOS(3, _omitFieldNames ? '' : 'username')
+    ..aOS(4, _omitFieldNames ? '' : 'message')..aOS(
+        5, _omitFieldNames ? '' : 'sanitizedMessage',
+      protoName: 'sanitizedMessage',
+    )
+    ..a<$core.int>(6, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..aOS(7, _omitFieldNames ? '' : 'color')
+    ..aOB(8, _omitFieldNames ? '' : 'isVisible', protoName: 'isVisible')
+    ..pc<ChatReaction>(
+        9, _omitFieldNames ? '' : 'reactions', $pb.PbFieldType.PM,
+      subBuilder: ChatReaction.create,
+    )
+    ..pc<ChatMessage>(10, _omitFieldNames ? '' : 'replies', $pb.PbFieldType.PM,
+      subBuilder: ChatMessage.create,
+    )
+    ..pc<AddressedUser>(
+        11, _omitFieldNames ? '' : 'addressedUsers', $pb.PbFieldType.PM,
+      protoName: 'addressedUsers',
+      subBuilder: AddressedUser.create,
+    )
+    ..aOB(12, _omitFieldNames ? '' : 'isResolved', protoName: 'isResolved')
+    ..aOM<$1.Timestamp>(13, _omitFieldNames ? '' : 'createdAt',
+      protoName: 'createdAt',
+      subBuilder: $1.Timestamp.create,
+    )
+    ..aOB(14, _omitFieldNames ? '' : 'isAdmin', protoName: 'isAdmin')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  ChatMessage clone() => ChatMessage()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  ChatMessage copyWith(void Function(ChatMessage) updates) =>
+      super.copyWith((message) => updates(message as ChatMessage))
+          as ChatMessage;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetUserCoursesRequest create() => GetUserCoursesRequest._();
-  GetUserCoursesRequest createEmptyInstance() => create();
-  static $pb.PbList<GetUserCoursesRequest> createRepeated() => $pb.PbList<GetUserCoursesRequest>();
+  static ChatMessage create() => ChatMessage._();
+  ChatMessage createEmptyInstance() => create();
+  static $pb.PbList<ChatMessage> createRepeated() => $pb.PbList<ChatMessage>();
   @$core.pragma('dart2js:noInline')
-  static GetUserCoursesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserCoursesRequest>(create);
-  static GetUserCoursesRequest? _defaultInstance;
+  static ChatMessage getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<ChatMessage>(create);
+  static ChatMessage? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.int get year => $_getIZ(0);
+  $core.int get id => $_getIZ(0);
   @$pb.TagNumber(1)
-  set year($core.int v) { $_setSignedInt32(0, v); }
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
-  $core.bool hasYear() => $_has(0);
+  $core.bool hasId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearYear() => clearField(1);
+  void clearId() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get term => $_getSZ(1);
+  $core.String get userID => $_getSZ(1);
   @$pb.TagNumber(2)
-  set term($core.String v) { $_setString(1, v); }
+  set userID($core.String v) {
+    $_setString(1, v);
+  }
+
   @$pb.TagNumber(2)
-  $core.bool hasTerm() => $_has(1);
+  $core.bool hasUserID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearTerm() => clearField(2);
+  void clearUserID() => clearField(2);
 
   @$pb.TagNumber(3)
-  $core.String get query => $_getSZ(2);
+  $core.String get username => $_getSZ(2);
   @$pb.TagNumber(3)
-  set query($core.String v) { $_setString(2, v); }
+  set username($core.String v) {
+    $_setString(2, v);
+  }
+
   @$pb.TagNumber(3)
-  $core.bool hasQuery() => $_has(2);
+  $core.bool hasUsername() => $_has(2);
   @$pb.TagNumber(3)
-  void clearQuery() => clearField(3);
+  void clearUsername() => clearField(3);
 
   @$pb.TagNumber(4)
-  $core.int get limit => $_getIZ(3);
+  $core.String get message => $_getSZ(3);
   @$pb.TagNumber(4)
-  set limit($core.int v) { $_setSignedInt32(3, v); }
+  set message($core.String v) {
+    $_setString(3, v);
+  }
+
   @$pb.TagNumber(4)
-  $core.bool hasLimit() => $_has(3);
+  $core.bool hasMessage() => $_has(3);
   @$pb.TagNumber(4)
-  void clearLimit() => clearField(4);
+  void clearMessage() => clearField(4);
 
   @$pb.TagNumber(5)
-  $core.int get skip => $_getIZ(4);
+  $core.String get sanitizedMessage => $_getSZ(4);
   @$pb.TagNumber(5)
-  set skip($core.int v) { $_setSignedInt32(4, v); }
+  set sanitizedMessage($core.String v) {
+    $_setString(4, v);
+  }
+
   @$pb.TagNumber(5)
-  $core.bool hasSkip() => $_has(4);
+  $core.bool hasSanitizedMessage() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSkip() => clearField(5);
-}
+  void clearSanitizedMessage() => clearField(5);
 
-class GetUserPinnedRequest extends $pb.GeneratedMessage {
-  factory GetUserPinnedRequest({
-    $core.int? year,
-    $core.String? term,
-    $core.int? limit,
-    $core.int? skip,
-  }) {
-    final $result = create();
-    if (year != null) {
-      $result.year = year;
-    }
-    if (term != null) {
-      $result.term = term;
-    }
-    if (limit != null) {
-      $result.limit = limit;
-    }
-    if (skip != null) {
-      $result.skip = skip;
-    }
-    return $result;
+  @$pb.TagNumber(6)
+  $core.int get streamID => $_getIZ(5);
+  @$pb.TagNumber(6)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(5, v);
   }
-  GetUserPinnedRequest._() : super();
-  factory GetUserPinnedRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserPinnedRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserPinnedRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'year', $pb.PbFieldType.O3)
-    ..aOS(2, _omitFieldNames ? '' : 'term')
-    ..a<$core.int>(3, _omitFieldNames ? '' : 'limit', $pb.PbFieldType.O3)
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'skip', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserPinnedRequest clone() => GetUserPinnedRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserPinnedRequest copyWith(void Function(GetUserPinnedRequest) updates) => super.copyWith((message) => updates(message as GetUserPinnedRequest)) as GetUserPinnedRequest;
-
-  $pb.BuilderInfo get info_ => _i;
 
-  @$core.pragma('dart2js:noInline')
-  static GetUserPinnedRequest create() => GetUserPinnedRequest._();
-  GetUserPinnedRequest createEmptyInstance() => create();
-  static $pb.PbList<GetUserPinnedRequest> createRepeated() => $pb.PbList<GetUserPinnedRequest>();
-  @$core.pragma('dart2js:noInline')
-  static GetUserPinnedRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserPinnedRequest>(create);
-  static GetUserPinnedRequest? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get year => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set year($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasYear() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearYear() => clearField(1);
+  @$pb.TagNumber(6)
+  $core.bool hasStreamID() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearStreamID() => clearField(6);
 
-  @$pb.TagNumber(2)
-  $core.String get term => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set term($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasTerm() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearTerm() => clearField(2);
+  @$pb.TagNumber(7)
+  $core.String get color => $_getSZ(6);
+  @$pb.TagNumber(7)
+  set color($core.String v) {
+    $_setString(6, v);
+  }
 
-  @$pb.TagNumber(3)
-  $core.int get limit => $_getIZ(2);
-  @$pb.TagNumber(3)
-  set limit($core.int v) { $_setSignedInt32(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasLimit() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearLimit() => clearField(3);
+  @$pb.TagNumber(7)
+  $core.bool hasColor() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearColor() => clearField(7);
 
-  @$pb.TagNumber(4)
-  $core.int get skip => $_getIZ(3);
-  @$pb.TagNumber(4)
-  set skip($core.int v) { $_setSignedInt32(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasSkip() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearSkip() => clearField(4);
-}
+  @$pb.TagNumber(8)
+  $core.bool get isVisible => $_getBF(7);
+  @$pb.TagNumber(8)
+  set isVisible($core.bool v) {
+    $_setBool(7, v);
+  }
 
-class GetUserAdminRequest extends $pb.GeneratedMessage {
-  factory GetUserAdminRequest() => create();
-  GetUserAdminRequest._() : super();
-  factory GetUserAdminRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserAdminRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$pb.TagNumber(8)
+  $core.bool hasIsVisible() => $_has(7);
+  @$pb.TagNumber(8)
+  void clearIsVisible() => clearField(8);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserAdminRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
+  @$pb.TagNumber(9)
+  $core.List<ChatReaction> get reactions => $_getList(8);
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserAdminRequest clone() => GetUserAdminRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserAdminRequest copyWith(void Function(GetUserAdminRequest) updates) => super.copyWith((message) => updates(message as GetUserAdminRequest)) as GetUserAdminRequest;
+  @$pb.TagNumber(10)
+  $core.List<ChatMessage> get replies => $_getList(9);
 
-  $pb.BuilderInfo get info_ => _i;
+  @$pb.TagNumber(11)
+  $core.List<AddressedUser> get addressedUsers => $_getList(10);
 
-  @$core.pragma('dart2js:noInline')
-  static GetUserAdminRequest create() => GetUserAdminRequest._();
-  GetUserAdminRequest createEmptyInstance() => create();
-  static $pb.PbList<GetUserAdminRequest> createRepeated() => $pb.PbList<GetUserAdminRequest>();
-  @$core.pragma('dart2js:noInline')
-  static GetUserAdminRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserAdminRequest>(create);
-  static GetUserAdminRequest? _defaultInstance;
-}
+  @$pb.TagNumber(12)
+  $core.bool get isResolved => $_getBF(11);
+  @$pb.TagNumber(12)
+  set isResolved($core.bool v) {
+    $_setBool(11, v);
+  }
 
-class GetUserSettingsRequest extends $pb.GeneratedMessage {
-  factory GetUserSettingsRequest() => create();
-  GetUserSettingsRequest._() : super();
-  factory GetUserSettingsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserSettingsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  @$pb.TagNumber(12)
+  $core.bool hasIsResolved() => $_has(11);
+  @$pb.TagNumber(12)
+  void clearIsResolved() => clearField(12);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserSettingsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
+  @$pb.TagNumber(13)
+  $1.Timestamp get createdAt => $_getN(12);
+  @$pb.TagNumber(13)
+  set createdAt($1.Timestamp v) {
+    setField(13, v);
+  }
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserSettingsRequest clone() => GetUserSettingsRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserSettingsRequest copyWith(void Function(GetUserSettingsRequest) updates) => super.copyWith((message) => updates(message as GetUserSettingsRequest)) as GetUserSettingsRequest;
+  @$pb.TagNumber(13)
+  $core.bool hasCreatedAt() => $_has(12);
+  @$pb.TagNumber(13)
+  void clearCreatedAt() => clearField(13);
+  @$pb.TagNumber(13)
+  $1.Timestamp ensureCreatedAt() => $_ensure(12);
 
-  $pb.BuilderInfo get info_ => _i;
+  @$pb.TagNumber(14)
+  $core.bool get isAdmin => $_getBF(13);
+  @$pb.TagNumber(14)
+  set isAdmin($core.bool v) {
+    $_setBool(13, v);
+  }
 
-  @$core.pragma('dart2js:noInline')
-  static GetUserSettingsRequest create() => GetUserSettingsRequest._();
-  GetUserSettingsRequest createEmptyInstance() => create();
-  static $pb.PbList<GetUserSettingsRequest> createRepeated() => $pb.PbList<GetUserSettingsRequest>();
-  @$core.pragma('dart2js:noInline')
-  static GetUserSettingsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserSettingsRequest>(create);
-  static GetUserSettingsRequest? _defaultInstance;
+  @$pb.TagNumber(14)
+  $core.bool hasIsAdmin() => $_has(13);
+  @$pb.TagNumber(14)
+  void clearIsAdmin() => clearField(14);
 }
 
-class GetUserResponse extends $pb.GeneratedMessage {
-  factory GetUserResponse({
-    User? user,
+class GetChatMessagesRequest extends $pb.GeneratedMessage {
+  factory GetChatMessagesRequest({
+    $core.int? streamID,
   }) {
     final $result = create();
-    if (user != null) {
-      $result.user = user;
+    if (streamID != null) {
+      $result.streamID = streamID;
     }
     return $result;
   }
-  GetUserResponse._() : super();
-  factory GetUserResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..aOM<User>(1, _omitFieldNames ? '' : 'user', subBuilder: User.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserResponse clone() => GetUserResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserResponse copyWith(void Function(GetUserResponse) updates) => super.copyWith((message) => updates(message as GetUserResponse)) as GetUserResponse;
+  GetChatMessagesRequest._() : super();
+
+  factory GetChatMessagesRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetChatMessagesRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetChatMessagesRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetChatMessagesRequest clone() =>
+      GetChatMessagesRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetChatMessagesRequest copyWith(
+    void Function(GetChatMessagesRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetChatMessagesRequest))
+          as GetChatMessagesRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetUserResponse create() => GetUserResponse._();
-  GetUserResponse createEmptyInstance() => create();
-  static $pb.PbList<GetUserResponse> createRepeated() => $pb.PbList<GetUserResponse>();
+  static GetChatMessagesRequest create() => GetChatMessagesRequest._();
+  GetChatMessagesRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetChatMessagesRequest> createRepeated() =>
+      $pb.PbList<GetChatMessagesRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetUserResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserResponse>(create);
-  static GetUserResponse? _defaultInstance;
+  static GetChatMessagesRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetChatMessagesRequest>(create);
+  static GetChatMessagesRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  User get user => $_getN(0);
-  @$pb.TagNumber(1)
-  set user(User v) { setField(1, v); }
+  $core.int get streamID => $_getIZ(0);
   @$pb.TagNumber(1)
-  $core.bool hasUser() => $_has(0);
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
-  void clearUser() => clearField(1);
+  $core.bool hasStreamID() => $_has(0);
   @$pb.TagNumber(1)
-  User ensureUser() => $_ensure(0);
+  void clearStreamID() => clearField(1);
 }
 
-class GetUserCoursesResponse extends $pb.GeneratedMessage {
-  factory GetUserCoursesResponse({
-    $core.Iterable<Course>? courses,
+class PostChatMessageRequest extends $pb.GeneratedMessage {
+  factory PostChatMessageRequest({
+    $core.String? message,
+    $core.int? streamID,
   }) {
     final $result = create();
-    if (courses != null) {
-      $result.courses.addAll(courses);
+    if (message != null) {
+      $result.message = message;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
     }
     return $result;
   }
-  GetUserCoursesResponse._() : super();
-  factory GetUserCoursesResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserCoursesResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserCoursesResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM, subBuilder: Course.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserCoursesResponse clone() => GetUserCoursesResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserCoursesResponse copyWith(void Function(GetUserCoursesResponse) updates) => super.copyWith((message) => updates(message as GetUserCoursesResponse)) as GetUserCoursesResponse;
+  PostChatMessageRequest._() : super();
+
+  factory PostChatMessageRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostChatMessageRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostChatMessageRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'message')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostChatMessageRequest clone() =>
+      PostChatMessageRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostChatMessageRequest copyWith(
+    void Function(PostChatMessageRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostChatMessageRequest))
+          as PostChatMessageRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetUserCoursesResponse create() => GetUserCoursesResponse._();
-  GetUserCoursesResponse createEmptyInstance() => create();
-  static $pb.PbList<GetUserCoursesResponse> createRepeated() => $pb.PbList<GetUserCoursesResponse>();
+  static PostChatMessageRequest create() => PostChatMessageRequest._();
+  PostChatMessageRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PostChatMessageRequest> createRepeated() =>
+      $pb.PbList<PostChatMessageRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetUserCoursesResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserCoursesResponse>(create);
-  static GetUserCoursesResponse? _defaultInstance;
+  static PostChatMessageRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostChatMessageRequest>(create);
+  static PostChatMessageRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<Course> get courses => $_getList(0);
+  $core.String get message => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set message($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasMessage() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearMessage() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get streamID => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasStreamID() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearStreamID() => clearField(2);
 }
 
-class GetUserPinnedResponse extends $pb.GeneratedMessage {
-  factory GetUserPinnedResponse({
-    $core.Iterable<Course>? courses,
+class PostChatReactionRequest extends $pb.GeneratedMessage {
+  factory PostChatReactionRequest({
+    $core.String? emoji,
+    $core.int? streamID,
+    $core.int? chatID,
   }) {
     final $result = create();
-    if (courses != null) {
-      $result.courses.addAll(courses);
+    if (emoji != null) {
+      $result.emoji = emoji;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    if (chatID != null) {
+      $result.chatID = chatID;
     }
     return $result;
   }
-  GetUserPinnedResponse._() : super();
-  factory GetUserPinnedResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserPinnedResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserPinnedResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM, subBuilder: Course.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserPinnedResponse clone() => GetUserPinnedResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserPinnedResponse copyWith(void Function(GetUserPinnedResponse) updates) => super.copyWith((message) => updates(message as GetUserPinnedResponse)) as GetUserPinnedResponse;
+  PostChatReactionRequest._() : super();
+
+  factory PostChatReactionRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostChatReactionRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostChatReactionRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'emoji')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'chatID', $pb.PbFieldType.OU3,
+      protoName: 'chatID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostChatReactionRequest clone() =>
+      PostChatReactionRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostChatReactionRequest copyWith(
+    void Function(PostChatReactionRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostChatReactionRequest))
+          as PostChatReactionRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetUserPinnedResponse create() => GetUserPinnedResponse._();
-  GetUserPinnedResponse createEmptyInstance() => create();
-  static $pb.PbList<GetUserPinnedResponse> createRepeated() => $pb.PbList<GetUserPinnedResponse>();
+  static PostChatReactionRequest create() => PostChatReactionRequest._();
+  PostChatReactionRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PostChatReactionRequest> createRepeated() =>
+      $pb.PbList<PostChatReactionRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetUserPinnedResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserPinnedResponse>(create);
-  static GetUserPinnedResponse? _defaultInstance;
+  static PostChatReactionRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostChatReactionRequest>(create);
+  static PostChatReactionRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<Course> get courses => $_getList(0);
+  $core.String get emoji => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set emoji($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasEmoji() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearEmoji() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get streamID => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasStreamID() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearStreamID() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get chatID => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set chatID($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasChatID() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearChatID() => clearField(3);
 }
 
-class GetUserAdminResponse extends $pb.GeneratedMessage {
-  factory GetUserAdminResponse({
-    $core.Iterable<Course>? courses,
+class DeleteChatReactionRequest extends $pb.GeneratedMessage {
+  factory DeleteChatReactionRequest({
+    $core.int? streamID,
+    $core.int? chatID,
+    $core.int? reactionID,
   }) {
     final $result = create();
-    if (courses != null) {
-      $result.courses.addAll(courses);
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    if (chatID != null) {
+      $result.chatID = chatID;
+    }
+    if (reactionID != null) {
+      $result.reactionID = reactionID;
     }
     return $result;
   }
-  GetUserAdminResponse._() : super();
-  factory GetUserAdminResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserAdminResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserAdminResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM, subBuilder: Course.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserAdminResponse clone() => GetUserAdminResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserAdminResponse copyWith(void Function(GetUserAdminResponse) updates) => super.copyWith((message) => updates(message as GetUserAdminResponse)) as GetUserAdminResponse;
+  DeleteChatReactionRequest._() : super();
+
+  factory DeleteChatReactionRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeleteChatReactionRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeleteChatReactionRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'chatID', $pb.PbFieldType.OU3,
+      protoName: 'chatID',
+    )
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'reactionID', $pb.PbFieldType.OU3,
+      protoName: 'reactionID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeleteChatReactionRequest clone() =>
+      DeleteChatReactionRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeleteChatReactionRequest copyWith(
+    void Function(DeleteChatReactionRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as DeleteChatReactionRequest))
+          as DeleteChatReactionRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetUserAdminResponse create() => GetUserAdminResponse._();
-  GetUserAdminResponse createEmptyInstance() => create();
-  static $pb.PbList<GetUserAdminResponse> createRepeated() => $pb.PbList<GetUserAdminResponse>();
+  static DeleteChatReactionRequest create() => DeleteChatReactionRequest._();
+  DeleteChatReactionRequest createEmptyInstance() => create();
+
+  static $pb.PbList<DeleteChatReactionRequest> createRepeated() =>
+      $pb.PbList<DeleteChatReactionRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetUserAdminResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserAdminResponse>(create);
-  static GetUserAdminResponse? _defaultInstance;
+  static DeleteChatReactionRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeleteChatReactionRequest>(create);
+  static DeleteChatReactionRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<Course> get courses => $_getList(0);
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get chatID => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set chatID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasChatID() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearChatID() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get reactionID => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set reactionID($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasReactionID() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearReactionID() => clearField(3);
 }
 
-class GetUserSettingsResponse extends $pb.GeneratedMessage {
-  factory GetUserSettingsResponse({
-    $core.Iterable<UserSetting>? userSettings,
+class PostChatReplyRequest extends $pb.GeneratedMessage {
+  factory PostChatReplyRequest({
+    $core.String? message,
+    $core.int? streamID,
+    $core.int? chatID,
   }) {
     final $result = create();
-    if (userSettings != null) {
-      $result.userSettings.addAll(userSettings);
+    if (message != null) {
+      $result.message = message;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    if (chatID != null) {
+      $result.chatID = chatID;
     }
     return $result;
   }
-  GetUserSettingsResponse._() : super();
-  factory GetUserSettingsResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetUserSettingsResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUserSettingsResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..pc<UserSetting>(1, _omitFieldNames ? '' : 'userSettings', $pb.PbFieldType.PM, protoName: 'userSettings', subBuilder: UserSetting.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetUserSettingsResponse clone() => GetUserSettingsResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetUserSettingsResponse copyWith(void Function(GetUserSettingsResponse) updates) => super.copyWith((message) => updates(message as GetUserSettingsResponse)) as GetUserSettingsResponse;
+  PostChatReplyRequest._() : super();
+
+  factory PostChatReplyRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostChatReplyRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostChatReplyRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'message')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'chatID', $pb.PbFieldType.OU3,
+      protoName: 'chatID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostChatReplyRequest clone() =>
+      PostChatReplyRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostChatReplyRequest copyWith(void Function(PostChatReplyRequest) updates) =>
+      super.copyWith((message) => updates(message as PostChatReplyRequest))
+          as PostChatReplyRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetUserSettingsResponse create() => GetUserSettingsResponse._();
-  GetUserSettingsResponse createEmptyInstance() => create();
-  static $pb.PbList<GetUserSettingsResponse> createRepeated() => $pb.PbList<GetUserSettingsResponse>();
+  static PostChatReplyRequest create() => PostChatReplyRequest._();
+  PostChatReplyRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PostChatReplyRequest> createRepeated() =>
+      $pb.PbList<PostChatReplyRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetUserSettingsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetUserSettingsResponse>(create);
-  static GetUserSettingsResponse? _defaultInstance;
+  static PostChatReplyRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostChatReplyRequest>(create);
+  static PostChatReplyRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<UserSetting> get userSettings => $_getList(0);
-}
+  $core.String get message => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set message($core.String v) {
+    $_setString(0, v);
+  }
 
-class Bookmark extends $pb.GeneratedMessage {
-  factory Bookmark({
-    $core.int? id,
-    $core.String? description,
-    $core.int? hours,
-    $core.int? minutes,
-    $core.int? seconds,
-    $core.int? userID,
+  @$pb.TagNumber(1)
+  $core.bool hasMessage() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearMessage() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get streamID => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasStreamID() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearStreamID() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get chatID => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set chatID($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasChatID() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearChatID() => clearField(3);
+}
+
+class MarkChatMessageAsResolvedRequest extends $pb.GeneratedMessage {
+  factory MarkChatMessageAsResolvedRequest({
     $core.int? streamID,
+    $core.int? chatID,
   }) {
     final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (description != null) {
-      $result.description = description;
-    }
-    if (hours != null) {
-      $result.hours = hours;
-    }
-    if (minutes != null) {
-      $result.minutes = minutes;
-    }
-    if (seconds != null) {
-      $result.seconds = seconds;
-    }
-    if (userID != null) {
-      $result.userID = userID;
-    }
     if (streamID != null) {
       $result.streamID = streamID;
     }
+    if (chatID != null) {
+      $result.chatID = chatID;
+    }
     return $result;
   }
-  Bookmark._() : super();
-  factory Bookmark.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Bookmark.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Bookmark', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
-    ..aOS(2, _omitFieldNames ? '' : 'description')
-    ..a<$core.int>(3, _omitFieldNames ? '' : 'hours', $pb.PbFieldType.OU3)
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'minutes', $pb.PbFieldType.OU3)
-    ..a<$core.int>(5, _omitFieldNames ? '' : 'seconds', $pb.PbFieldType.OU3)
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'userID', $pb.PbFieldType.OU3, protoName: 'userID')
-    ..a<$core.int>(7, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3, protoName: 'streamID')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Bookmark clone() => Bookmark()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Bookmark copyWith(void Function(Bookmark) updates) => super.copyWith((message) => updates(message as Bookmark)) as Bookmark;
+  MarkChatMessageAsResolvedRequest._() : super();
+
+  factory MarkChatMessageAsResolvedRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory MarkChatMessageAsResolvedRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MarkChatMessageAsResolvedRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'chatID', $pb.PbFieldType.OU3,
+      protoName: 'chatID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsResolvedRequest clone() =>
+      MarkChatMessageAsResolvedRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsResolvedRequest copyWith(
+    void Function(MarkChatMessageAsResolvedRequest) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as MarkChatMessageAsResolvedRequest),
+      ) as MarkChatMessageAsResolvedRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static Bookmark create() => Bookmark._();
-  Bookmark createEmptyInstance() => create();
-  static $pb.PbList<Bookmark> createRepeated() => $pb.PbList<Bookmark>();
+  static MarkChatMessageAsResolvedRequest create() =>
+      MarkChatMessageAsResolvedRequest._();
+  MarkChatMessageAsResolvedRequest createEmptyInstance() => create();
+
+  static $pb.PbList<MarkChatMessageAsResolvedRequest> createRepeated() =>
+      $pb.PbList<MarkChatMessageAsResolvedRequest>();
   @$core.pragma('dart2js:noInline')
-  static Bookmark getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Bookmark>(create);
-  static Bookmark? _defaultInstance;
+  static MarkChatMessageAsResolvedRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<MarkChatMessageAsResolvedRequest>(
+        create,
+      );
+  static MarkChatMessageAsResolvedRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.int get id => $_getIZ(0);
+  $core.int get streamID => $_getIZ(0);
   @$pb.TagNumber(1)
-  set id($core.int v) { $_setUnsignedInt32(0, v); }
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
+  $core.bool hasStreamID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  void clearStreamID() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get description => $_getSZ(1);
+  $core.int get chatID => $_getIZ(1);
   @$pb.TagNumber(2)
-  set description($core.String v) { $_setString(1, v); }
+  set chatID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
-  $core.bool hasDescription() => $_has(1);
+  $core.bool hasChatID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDescription() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.int get hours => $_getIZ(2);
-  @$pb.TagNumber(3)
-  set hours($core.int v) { $_setUnsignedInt32(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasHours() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearHours() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.int get minutes => $_getIZ(3);
-  @$pb.TagNumber(4)
-  set minutes($core.int v) { $_setUnsignedInt32(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasMinutes() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearMinutes() => clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.int get seconds => $_getIZ(4);
-  @$pb.TagNumber(5)
-  set seconds($core.int v) { $_setUnsignedInt32(4, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasSeconds() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearSeconds() => clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.int get userID => $_getIZ(5);
-  @$pb.TagNumber(6)
-  set userID($core.int v) { $_setUnsignedInt32(5, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasUserID() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearUserID() => clearField(6);
-
-  @$pb.TagNumber(7)
-  $core.int get streamID => $_getIZ(6);
-  @$pb.TagNumber(7)
-  set streamID($core.int v) { $_setUnsignedInt32(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasStreamID() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearStreamID() => clearField(7);
+  void clearChatID() => clearField(2);
 }
 
-class GetBookmarksRequest extends $pb.GeneratedMessage {
-  factory GetBookmarksRequest({
+class MarkChatMessageAsUnresolvedRequest extends $pb.GeneratedMessage {
+  factory MarkChatMessageAsUnresolvedRequest({
     $core.int? streamID,
+    $core.int? chatID,
   }) {
     final $result = create();
     if (streamID != null) {
       $result.streamID = streamID;
     }
+    if (chatID != null) {
+      $result.chatID = chatID;
+    }
     return $result;
   }
-  GetBookmarksRequest._() : super();
-  factory GetBookmarksRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetBookmarksRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetBookmarksRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.O3, protoName: 'streamID')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetBookmarksRequest clone() => GetBookmarksRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetBookmarksRequest copyWith(void Function(GetBookmarksRequest) updates) => super.copyWith((message) => updates(message as GetBookmarksRequest)) as GetBookmarksRequest;
+  MarkChatMessageAsUnresolvedRequest._() : super();
+
+  factory MarkChatMessageAsUnresolvedRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory MarkChatMessageAsUnresolvedRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MarkChatMessageAsUnresolvedRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'chatID', $pb.PbFieldType.OU3,
+      protoName: 'chatID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsUnresolvedRequest clone() =>
+      MarkChatMessageAsUnresolvedRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsUnresolvedRequest copyWith(
+    void Function(MarkChatMessageAsUnresolvedRequest) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as MarkChatMessageAsUnresolvedRequest),
+      ) as MarkChatMessageAsUnresolvedRequest;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetBookmarksRequest create() => GetBookmarksRequest._();
-  GetBookmarksRequest createEmptyInstance() => create();
-  static $pb.PbList<GetBookmarksRequest> createRepeated() => $pb.PbList<GetBookmarksRequest>();
+  static MarkChatMessageAsUnresolvedRequest create() =>
+      MarkChatMessageAsUnresolvedRequest._();
+  MarkChatMessageAsUnresolvedRequest createEmptyInstance() => create();
+
+  static $pb.PbList<MarkChatMessageAsUnresolvedRequest> createRepeated() =>
+      $pb.PbList<MarkChatMessageAsUnresolvedRequest>();
   @$core.pragma('dart2js:noInline')
-  static GetBookmarksRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetBookmarksRequest>(create);
-  static GetBookmarksRequest? _defaultInstance;
+  static MarkChatMessageAsUnresolvedRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<MarkChatMessageAsUnresolvedRequest>(
+        create,
+      );
+  static MarkChatMessageAsUnresolvedRequest? _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get streamID => $_getIZ(0);
   @$pb.TagNumber(1)
-  set streamID($core.int v) { $_setSignedInt32(0, v); }
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasStreamID() => $_has(0);
   @$pb.TagNumber(1)
   void clearStreamID() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get chatID => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set chatID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasChatID() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearChatID() => clearField(2);
 }
 
-class GetBookmarksResponse extends $pb.GeneratedMessage {
-  factory GetBookmarksResponse({
-    $core.Iterable<Bookmark>? bookmarks,
+class GetChatMessagesResponse extends $pb.GeneratedMessage {
+  factory GetChatMessagesResponse({
+    $core.Iterable<ChatMessage>? messages,
   }) {
     final $result = create();
-    if (bookmarks != null) {
-      $result.bookmarks.addAll(bookmarks);
+    if (messages != null) {
+      $result.messages.addAll(messages);
     }
     return $result;
   }
-  GetBookmarksResponse._() : super();
-  factory GetBookmarksResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory GetBookmarksResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetBookmarksResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..pc<Bookmark>(1, _omitFieldNames ? '' : 'bookmarks', $pb.PbFieldType.PM, subBuilder: Bookmark.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  GetBookmarksResponse clone() => GetBookmarksResponse()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  GetBookmarksResponse copyWith(void Function(GetBookmarksResponse) updates) => super.copyWith((message) => updates(message as GetBookmarksResponse)) as GetBookmarksResponse;
+  GetChatMessagesResponse._() : super();
+
+  factory GetChatMessagesResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetChatMessagesResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetChatMessagesResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<ChatMessage>(1, _omitFieldNames ? '' : 'messages', $pb.PbFieldType.PM,
+      subBuilder: ChatMessage.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetChatMessagesResponse clone() =>
+      GetChatMessagesResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetChatMessagesResponse copyWith(
+    void Function(GetChatMessagesResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetChatMessagesResponse))
+          as GetChatMessagesResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static GetBookmarksResponse create() => GetBookmarksResponse._();
-  GetBookmarksResponse createEmptyInstance() => create();
-  static $pb.PbList<GetBookmarksResponse> createRepeated() => $pb.PbList<GetBookmarksResponse>();
+  static GetChatMessagesResponse create() => GetChatMessagesResponse._();
+  GetChatMessagesResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetChatMessagesResponse> createRepeated() =>
+      $pb.PbList<GetChatMessagesResponse>();
   @$core.pragma('dart2js:noInline')
-  static GetBookmarksResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<GetBookmarksResponse>(create);
-  static GetBookmarksResponse? _defaultInstance;
+  static GetChatMessagesResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetChatMessagesResponse>(create);
+  static GetChatMessagesResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<Bookmark> get bookmarks => $_getList(0);
+  $core.List<ChatMessage> get messages => $_getList(0);
 }
 
-class Course extends $pb.GeneratedMessage {
-  factory Course({
-    $core.int? id,
-    $core.String? name,
-    $core.String? slug,
-    Semester? semester,
-    $core.String? tUMOnlineIdentifier,
-    $core.bool? vODEnabled,
-    $core.bool? downloadsEnabled,
-    $core.bool? chatEnabled,
-    $core.bool? anonymousChatEnabled,
-    $core.bool? moderatedChatEnabled,
-    $core.bool? vodChatEnabled,
-    $core.Iterable<Stream>? streams,
-    $core.String? cameraPresetPreferences,
-    $core.String? sourcePreferences,
+class PostChatMessageResponse extends $pb.GeneratedMessage {
+  factory PostChatMessageResponse({
+    ChatMessage? message,
   }) {
     final $result = create();
-    if (id != null) {
-      $result.id = id;
-    }
-    if (name != null) {
-      $result.name = name;
-    }
-    if (slug != null) {
-      $result.slug = slug;
-    }
-    if (semester != null) {
-      $result.semester = semester;
-    }
-    if (tUMOnlineIdentifier != null) {
-      $result.tUMOnlineIdentifier = tUMOnlineIdentifier;
-    }
-    if (vODEnabled != null) {
-      $result.vODEnabled = vODEnabled;
-    }
-    if (downloadsEnabled != null) {
-      $result.downloadsEnabled = downloadsEnabled;
-    }
-    if (chatEnabled != null) {
-      $result.chatEnabled = chatEnabled;
-    }
-    if (anonymousChatEnabled != null) {
-      $result.anonymousChatEnabled = anonymousChatEnabled;
-    }
-    if (moderatedChatEnabled != null) {
-      $result.moderatedChatEnabled = moderatedChatEnabled;
-    }
-    if (vodChatEnabled != null) {
-      $result.vodChatEnabled = vodChatEnabled;
-    }
-    if (streams != null) {
-      $result.streams.addAll(streams);
-    }
-    if (cameraPresetPreferences != null) {
-      $result.cameraPresetPreferences = cameraPresetPreferences;
-    }
-    if (sourcePreferences != null) {
-      $result.sourcePreferences = sourcePreferences;
+    if (message != null) {
+      $result.message = message;
     }
     return $result;
   }
-  Course._() : super();
-  factory Course.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Course.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Course', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..aOS(3, _omitFieldNames ? '' : 'slug')
-    ..aOM<Semester>(4, _omitFieldNames ? '' : 'semester', subBuilder: Semester.create)
-    ..aOS(5, _omitFieldNames ? '' : 'TUMOnlineIdentifier', protoName: 'TUMOnlineIdentifier')
-    ..aOB(6, _omitFieldNames ? '' : 'VODEnabled', protoName: 'VODEnabled')
-    ..aOB(7, _omitFieldNames ? '' : 'downloadsEnabled', protoName: 'downloadsEnabled')
-    ..aOB(8, _omitFieldNames ? '' : 'chatEnabled', protoName: 'chatEnabled')
-    ..aOB(9, _omitFieldNames ? '' : 'anonymousChatEnabled', protoName: 'anonymousChatEnabled')
-    ..aOB(10, _omitFieldNames ? '' : 'moderatedChatEnabled', protoName: 'moderatedChatEnabled')
-    ..aOB(11, _omitFieldNames ? '' : 'vodChatEnabled', protoName: 'vodChatEnabled')
-    ..pc<Stream>(12, _omitFieldNames ? '' : 'streams', $pb.PbFieldType.PM, subBuilder: Stream.create)
-    ..aOS(13, _omitFieldNames ? '' : 'cameraPresetPreferences', protoName: 'cameraPresetPreferences')
-    ..aOS(14, _omitFieldNames ? '' : 'sourcePreferences', protoName: 'sourcePreferences')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Course clone() => Course()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Course copyWith(void Function(Course) updates) => super.copyWith((message) => updates(message as Course)) as Course;
+  PostChatMessageResponse._() : super();
+
+  factory PostChatMessageResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostChatMessageResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostChatMessageResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<ChatMessage>(1, _omitFieldNames ? '' : 'message',
+      subBuilder: ChatMessage.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostChatMessageResponse clone() =>
+      PostChatMessageResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostChatMessageResponse copyWith(
+    void Function(PostChatMessageResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostChatMessageResponse))
+          as PostChatMessageResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static Course create() => Course._();
-  Course createEmptyInstance() => create();
-  static $pb.PbList<Course> createRepeated() => $pb.PbList<Course>();
+  static PostChatMessageResponse create() => PostChatMessageResponse._();
+  PostChatMessageResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PostChatMessageResponse> createRepeated() =>
+      $pb.PbList<PostChatMessageResponse>();
   @$core.pragma('dart2js:noInline')
-  static Course getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Course>(create);
-  static Course? _defaultInstance;
+  static PostChatMessageResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostChatMessageResponse>(create);
+  static PostChatMessageResponse? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.int get id => $_getIZ(0);
+  ChatMessage get message => $_getN(0);
+  @$pb.TagNumber(1)
+  set message(ChatMessage v) {
+    setField(1, v);
+  }
+
   @$pb.TagNumber(1)
-  set id($core.int v) { $_setUnsignedInt32(0, v); }
+  $core.bool hasMessage() => $_has(0);
   @$pb.TagNumber(1)
-  $core.bool hasId() => $_has(0);
+  void clearMessage() => clearField(1);
   @$pb.TagNumber(1)
-  void clearId() => clearField(1);
+  ChatMessage ensureMessage() => $_ensure(0);
+}
 
-  @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
-  @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+class PostChatReactionResponse extends $pb.GeneratedMessage {
+  factory PostChatReactionResponse({
+    ChatReaction? reaction,
+  }) {
+    final $result = create();
+    if (reaction != null) {
+      $result.reaction = reaction;
+    }
+    return $result;
+  }
+  PostChatReactionResponse._() : super();
+
+  factory PostChatReactionResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostChatReactionResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostChatReactionResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<ChatReaction>(1, _omitFieldNames ? '' : 'reaction',
+      subBuilder: ChatReaction.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostChatReactionResponse clone() =>
+      PostChatReactionResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostChatReactionResponse copyWith(
+    void Function(PostChatReactionResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostChatReactionResponse))
+          as PostChatReactionResponse;
 
-  @$pb.TagNumber(3)
-  $core.String get slug => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set slug($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasSlug() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearSlug() => clearField(3);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(4)
-  Semester get semester => $_getN(3);
-  @$pb.TagNumber(4)
-  set semester(Semester v) { setField(4, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasSemester() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearSemester() => clearField(4);
-  @$pb.TagNumber(4)
-  Semester ensureSemester() => $_ensure(3);
+  @$core.pragma('dart2js:noInline')
+  static PostChatReactionResponse create() => PostChatReactionResponse._();
+  PostChatReactionResponse createEmptyInstance() => create();
 
-  @$pb.TagNumber(5)
-  $core.String get tUMOnlineIdentifier => $_getSZ(4);
-  @$pb.TagNumber(5)
-  set tUMOnlineIdentifier($core.String v) { $_setString(4, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasTUMOnlineIdentifier() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearTUMOnlineIdentifier() => clearField(5);
+  static $pb.PbList<PostChatReactionResponse> createRepeated() =>
+      $pb.PbList<PostChatReactionResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PostChatReactionResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostChatReactionResponse>(create);
+  static PostChatReactionResponse? _defaultInstance;
 
-  @$pb.TagNumber(6)
-  $core.bool get vODEnabled => $_getBF(5);
-  @$pb.TagNumber(6)
-  set vODEnabled($core.bool v) { $_setBool(5, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasVODEnabled() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearVODEnabled() => clearField(6);
+  @$pb.TagNumber(1)
+  ChatReaction get reaction => $_getN(0);
+  @$pb.TagNumber(1)
+  set reaction(ChatReaction v) {
+    setField(1, v);
+  }
 
-  @$pb.TagNumber(7)
-  $core.bool get downloadsEnabled => $_getBF(6);
-  @$pb.TagNumber(7)
-  set downloadsEnabled($core.bool v) { $_setBool(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasDownloadsEnabled() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearDownloadsEnabled() => clearField(7);
+  @$pb.TagNumber(1)
+  $core.bool hasReaction() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearReaction() => clearField(1);
+  @$pb.TagNumber(1)
+  ChatReaction ensureReaction() => $_ensure(0);
+}
 
-  @$pb.TagNumber(8)
-  $core.bool get chatEnabled => $_getBF(7);
-  @$pb.TagNumber(8)
-  set chatEnabled($core.bool v) { $_setBool(7, v); }
-  @$pb.TagNumber(8)
-  $core.bool hasChatEnabled() => $_has(7);
-  @$pb.TagNumber(8)
-  void clearChatEnabled() => clearField(8);
+class DeleteChatReactionResponse extends $pb.GeneratedMessage {
+  factory DeleteChatReactionResponse() => create();
+  DeleteChatReactionResponse._() : super();
+
+  factory DeleteChatReactionResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeleteChatReactionResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeleteChatReactionResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeleteChatReactionResponse clone() =>
+      DeleteChatReactionResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeleteChatReactionResponse copyWith(
+    void Function(DeleteChatReactionResponse) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as DeleteChatReactionResponse),
+      ) as DeleteChatReactionResponse;
 
-  @$pb.TagNumber(9)
-  $core.bool get anonymousChatEnabled => $_getBF(8);
-  @$pb.TagNumber(9)
-  set anonymousChatEnabled($core.bool v) { $_setBool(8, v); }
-  @$pb.TagNumber(9)
-  $core.bool hasAnonymousChatEnabled() => $_has(8);
-  @$pb.TagNumber(9)
-  void clearAnonymousChatEnabled() => clearField(9);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(10)
-  $core.bool get moderatedChatEnabled => $_getBF(9);
-  @$pb.TagNumber(10)
-  set moderatedChatEnabled($core.bool v) { $_setBool(9, v); }
-  @$pb.TagNumber(10)
-  $core.bool hasModeratedChatEnabled() => $_has(9);
-  @$pb.TagNumber(10)
-  void clearModeratedChatEnabled() => clearField(10);
+  @$core.pragma('dart2js:noInline')
+  static DeleteChatReactionResponse create() => DeleteChatReactionResponse._();
+  DeleteChatReactionResponse createEmptyInstance() => create();
 
-  @$pb.TagNumber(11)
-  $core.bool get vodChatEnabled => $_getBF(10);
-  @$pb.TagNumber(11)
-  set vodChatEnabled($core.bool v) { $_setBool(10, v); }
-  @$pb.TagNumber(11)
-  $core.bool hasVodChatEnabled() => $_has(10);
-  @$pb.TagNumber(11)
-  void clearVodChatEnabled() => clearField(11);
+  static $pb.PbList<DeleteChatReactionResponse> createRepeated() =>
+      $pb.PbList<DeleteChatReactionResponse>();
+  @$core.pragma('dart2js:noInline')
+  static DeleteChatReactionResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeleteChatReactionResponse>(create);
+  static DeleteChatReactionResponse? _defaultInstance;
+}
 
-  @$pb.TagNumber(12)
-  $core.List<Stream> get streams => $_getList(11);
+class PostChatReplyResponse extends $pb.GeneratedMessage {
+  factory PostChatReplyResponse({
+    ChatMessage? reply,
+  }) {
+    final $result = create();
+    if (reply != null) {
+      $result.reply = reply;
+    }
+    return $result;
+  }
+  PostChatReplyResponse._() : super();
+
+  factory PostChatReplyResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostChatReplyResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostChatReplyResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<ChatMessage>(1, _omitFieldNames ? '' : 'reply',
+      subBuilder: ChatMessage.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostChatReplyResponse clone() =>
+      PostChatReplyResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostChatReplyResponse copyWith(
+    void Function(PostChatReplyResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostChatReplyResponse))
+          as PostChatReplyResponse;
 
-  @$pb.TagNumber(13)
-  $core.String get cameraPresetPreferences => $_getSZ(12);
-  @$pb.TagNumber(13)
-  set cameraPresetPreferences($core.String v) { $_setString(12, v); }
-  @$pb.TagNumber(13)
-  $core.bool hasCameraPresetPreferences() => $_has(12);
-  @$pb.TagNumber(13)
-  void clearCameraPresetPreferences() => clearField(13);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(14)
-  $core.String get sourcePreferences => $_getSZ(13);
-  @$pb.TagNumber(14)
-  set sourcePreferences($core.String v) { $_setString(13, v); }
-  @$pb.TagNumber(14)
-  $core.bool hasSourcePreferences() => $_has(13);
-  @$pb.TagNumber(14)
-  void clearSourcePreferences() => clearField(14);
+  @$core.pragma('dart2js:noInline')
+  static PostChatReplyResponse create() => PostChatReplyResponse._();
+  PostChatReplyResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PostChatReplyResponse> createRepeated() =>
+      $pb.PbList<PostChatReplyResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PostChatReplyResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostChatReplyResponse>(create);
+  static PostChatReplyResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  ChatMessage get reply => $_getN(0);
+  @$pb.TagNumber(1)
+  set reply(ChatMessage v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasReply() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearReply() => clearField(1);
+  @$pb.TagNumber(1)
+  ChatMessage ensureReply() => $_ensure(0);
 }
 
-class Semester extends $pb.GeneratedMessage {
-  factory Semester({
-    $core.String? teachingTerm,
-    $core.int? year,
+class MarkChatMessageAsResolvedResponse extends $pb.GeneratedMessage {
+  factory MarkChatMessageAsResolvedResponse({
+    ChatMessage? message,
   }) {
     final $result = create();
-    if (teachingTerm != null) {
-      $result.teachingTerm = teachingTerm;
+    if (message != null) {
+      $result.message = message;
     }
-    if (year != null) {
-      $result.year = year;
+    return $result;
+  }
+  MarkChatMessageAsResolvedResponse._() : super();
+
+  factory MarkChatMessageAsResolvedResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory MarkChatMessageAsResolvedResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MarkChatMessageAsResolvedResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<ChatMessage>(1, _omitFieldNames ? '' : 'message',
+      subBuilder: ChatMessage.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsResolvedResponse clone() =>
+      MarkChatMessageAsResolvedResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsResolvedResponse copyWith(
+    void Function(MarkChatMessageAsResolvedResponse) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as MarkChatMessageAsResolvedResponse),
+      ) as MarkChatMessageAsResolvedResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MarkChatMessageAsResolvedResponse create() =>
+      MarkChatMessageAsResolvedResponse._();
+  MarkChatMessageAsResolvedResponse createEmptyInstance() => create();
+
+  static $pb.PbList<MarkChatMessageAsResolvedResponse> createRepeated() =>
+      $pb.PbList<MarkChatMessageAsResolvedResponse>();
+  @$core.pragma('dart2js:noInline')
+  static MarkChatMessageAsResolvedResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<MarkChatMessageAsResolvedResponse>(
+        create,
+      );
+  static MarkChatMessageAsResolvedResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  ChatMessage get message => $_getN(0);
+  @$pb.TagNumber(1)
+  set message(ChatMessage v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasMessage() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearMessage() => clearField(1);
+  @$pb.TagNumber(1)
+  ChatMessage ensureMessage() => $_ensure(0);
+}
+
+class MarkChatMessageAsUnresolvedResponse extends $pb.GeneratedMessage {
+  factory MarkChatMessageAsUnresolvedResponse({
+    ChatMessage? message,
+  }) {
+    final $result = create();
+    if (message != null) {
+      $result.message = message;
     }
     return $result;
   }
-  Semester._() : super();
-  factory Semester.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Semester.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Semester', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..aOS(3, _omitFieldNames ? '' : 'teachingTerm', protoName: 'teachingTerm')
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'year', $pb.PbFieldType.OU3)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Semester clone() => Semester()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Semester copyWith(void Function(Semester) updates) => super.copyWith((message) => updates(message as Semester)) as Semester;
+  MarkChatMessageAsUnresolvedResponse._() : super();
+
+  factory MarkChatMessageAsUnresolvedResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory MarkChatMessageAsUnresolvedResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MarkChatMessageAsUnresolvedResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<ChatMessage>(1, _omitFieldNames ? '' : 'message',
+      subBuilder: ChatMessage.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsUnresolvedResponse clone() =>
+      MarkChatMessageAsUnresolvedResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  MarkChatMessageAsUnresolvedResponse copyWith(
+    void Function(MarkChatMessageAsUnresolvedResponse) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as MarkChatMessageAsUnresolvedResponse),
+      ) as MarkChatMessageAsUnresolvedResponse;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static Semester create() => Semester._();
-  Semester createEmptyInstance() => create();
-  static $pb.PbList<Semester> createRepeated() => $pb.PbList<Semester>();
+  static MarkChatMessageAsUnresolvedResponse create() =>
+      MarkChatMessageAsUnresolvedResponse._();
+  MarkChatMessageAsUnresolvedResponse createEmptyInstance() => create();
+
+  static $pb.PbList<MarkChatMessageAsUnresolvedResponse> createRepeated() =>
+      $pb.PbList<MarkChatMessageAsUnresolvedResponse>();
   @$core.pragma('dart2js:noInline')
-  static Semester getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Semester>(create);
-  static Semester? _defaultInstance;
+  static MarkChatMessageAsUnresolvedResponse getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          MarkChatMessageAsUnresolvedResponse>(create);
+  static MarkChatMessageAsUnresolvedResponse? _defaultInstance;
 
-  @$pb.TagNumber(3)
-  $core.String get teachingTerm => $_getSZ(0);
-  @$pb.TagNumber(3)
-  set teachingTerm($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasTeachingTerm() => $_has(0);
-  @$pb.TagNumber(3)
-  void clearTeachingTerm() => clearField(3);
+  @$pb.TagNumber(1)
+  ChatMessage get message => $_getN(0);
+  @$pb.TagNumber(1)
+  set message(ChatMessage v) {
+    setField(1, v);
+  }
 
-  @$pb.TagNumber(4)
-  $core.int get year => $_getIZ(1);
-  @$pb.TagNumber(4)
-  set year($core.int v) { $_setUnsignedInt32(1, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasYear() => $_has(1);
-  @$pb.TagNumber(4)
-  void clearYear() => clearField(4);
+  @$pb.TagNumber(1)
+  $core.bool hasMessage() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearMessage() => clearField(1);
+  @$pb.TagNumber(1)
+  ChatMessage ensureMessage() => $_ensure(0);
 }
 
-class Stream extends $pb.GeneratedMessage {
-  factory Stream({
-    $fixnum.Int64? id,
-    $core.String? name,
-    $core.String? description,
-    $core.int? courseID,
-    $1.Timestamp? start,
-    $1.Timestamp? end,
-    $core.bool? chatEnabled,
-    $core.String? roomName,
-    $core.String? roomCode,
-    $core.String? eventTypeName,
-    $core.int? tUMOnlineEventID,
-    $core.String? seriesIdentifier,
-    $core.String? playlistUrl,
-    $core.String? playlistUrlPRES,
-    $core.String? playlistUrlCAM,
-    $core.bool? liveNow,
-    $1.Timestamp? liveNowTimestamp,
-    $core.bool? recording,
-    $core.bool? premiere,
-    $core.bool? ended,
-    $core.int? vodViews,
-    $core.int? startOffset,
-    $core.int? endOffset,
-    $core.int? duration,
+class Poll extends $pb.GeneratedMessage {
+  factory Poll({
+    $core.int? id,
+    $core.int? streamID,
+    $core.String? question,
+    $core.bool? active,
+    $core.Iterable<PollOption>? pollOptions,
   }) {
     final $result = create();
     if (id != null) {
       $result.id = id;
     }
-    if (name != null) {
-      $result.name = name;
-    }
-    if (description != null) {
-      $result.description = description;
-    }
-    if (courseID != null) {
-      $result.courseID = courseID;
-    }
-    if (start != null) {
-      $result.start = start;
-    }
-    if (end != null) {
-      $result.end = end;
-    }
-    if (chatEnabled != null) {
-      $result.chatEnabled = chatEnabled;
-    }
-    if (roomName != null) {
-      $result.roomName = roomName;
-    }
-    if (roomCode != null) {
-      $result.roomCode = roomCode;
-    }
-    if (eventTypeName != null) {
-      $result.eventTypeName = eventTypeName;
-    }
-    if (tUMOnlineEventID != null) {
-      $result.tUMOnlineEventID = tUMOnlineEventID;
-    }
-    if (seriesIdentifier != null) {
-      $result.seriesIdentifier = seriesIdentifier;
-    }
-    if (playlistUrl != null) {
-      $result.playlistUrl = playlistUrl;
-    }
-    if (playlistUrlPRES != null) {
-      $result.playlistUrlPRES = playlistUrlPRES;
-    }
-    if (playlistUrlCAM != null) {
-      $result.playlistUrlCAM = playlistUrlCAM;
-    }
-    if (liveNow != null) {
-      $result.liveNow = liveNow;
-    }
-    if (liveNowTimestamp != null) {
-      $result.liveNowTimestamp = liveNowTimestamp;
-    }
-    if (recording != null) {
-      $result.recording = recording;
-    }
-    if (premiere != null) {
-      $result.premiere = premiere;
-    }
-    if (ended != null) {
-      $result.ended = ended;
-    }
-    if (vodViews != null) {
-      $result.vodViews = vodViews;
+    if (streamID != null) {
+      $result.streamID = streamID;
     }
-    if (startOffset != null) {
-      $result.startOffset = startOffset;
+    if (question != null) {
+      $result.question = question;
     }
-    if (endOffset != null) {
-      $result.endOffset = endOffset;
+    if (active != null) {
+      $result.active = active;
     }
-    if (duration != null) {
-      $result.duration = duration;
+    if (pollOptions != null) {
+      $result.pollOptions.addAll(pollOptions);
     }
     return $result;
   }
-  Stream._() : super();
-  factory Stream.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Stream.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Stream', package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'), createEmptyInstance: create)
-    ..a<$fixnum.Int64>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU6, defaultOrMaker: $fixnum.Int64.ZERO)
-    ..aOS(2, _omitFieldNames ? '' : 'name')
-    ..aOS(3, _omitFieldNames ? '' : 'description')
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'courseID', $pb.PbFieldType.OU3, protoName: 'courseID')
-    ..aOM<$1.Timestamp>(5, _omitFieldNames ? '' : 'start', subBuilder: $1.Timestamp.create)
-    ..aOM<$1.Timestamp>(6, _omitFieldNames ? '' : 'end', subBuilder: $1.Timestamp.create)
-    ..aOB(7, _omitFieldNames ? '' : 'chatEnabled', protoName: 'chatEnabled')
-    ..aOS(8, _omitFieldNames ? '' : 'roomName', protoName: 'roomName')
-    ..aOS(9, _omitFieldNames ? '' : 'roomCode', protoName: 'roomCode')
-    ..aOS(10, _omitFieldNames ? '' : 'eventTypeName', protoName: 'eventTypeName')
-    ..a<$core.int>(11, _omitFieldNames ? '' : 'TUMOnlineEventID', $pb.PbFieldType.OU3, protoName: 'TUMOnlineEventID')
-    ..aOS(12, _omitFieldNames ? '' : 'seriesIdentifier', protoName: 'seriesIdentifier')
-    ..aOS(13, _omitFieldNames ? '' : 'playlistUrl', protoName: 'playlistUrl')
-    ..aOS(14, _omitFieldNames ? '' : 'playlistUrlPRES', protoName: 'playlistUrlPRES')
-    ..aOS(15, _omitFieldNames ? '' : 'playlistUrlCAM', protoName: 'playlistUrlCAM')
-    ..aOB(16, _omitFieldNames ? '' : 'liveNow', protoName: 'liveNow')
-    ..aOM<$1.Timestamp>(17, _omitFieldNames ? '' : 'liveNowTimestamp', protoName: 'liveNowTimestamp', subBuilder: $1.Timestamp.create)
-    ..aOB(18, _omitFieldNames ? '' : 'recording')
-    ..aOB(19, _omitFieldNames ? '' : 'premiere')
-    ..aOB(20, _omitFieldNames ? '' : 'ended')
-    ..a<$core.int>(21, _omitFieldNames ? '' : 'vodViews', $pb.PbFieldType.OU3, protoName: 'vodViews')
-    ..a<$core.int>(22, _omitFieldNames ? '' : 'startOffset', $pb.PbFieldType.OU3, protoName: 'startOffset')
-    ..a<$core.int>(23, _omitFieldNames ? '' : 'endOffset', $pb.PbFieldType.OU3, protoName: 'endOffset')
-    ..a<$core.int>(28, _omitFieldNames ? '' : 'duration', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Stream clone() => Stream()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Stream copyWith(void Function(Stream) updates) => super.copyWith((message) => updates(message as Stream)) as Stream;
+  Poll._() : super();
+
+  factory Poll.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Poll.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Poll',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..aOS(3, _omitFieldNames ? '' : 'question')
+    ..aOB(4, _omitFieldNames ? '' : 'active')
+    ..pc<PollOption>(
+        5, _omitFieldNames ? '' : 'pollOptions', $pb.PbFieldType.PM,
+      protoName: 'pollOptions',
+      subBuilder: PollOption.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Poll clone() => Poll()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Poll copyWith(void Function(Poll) updates) =>
+      super.copyWith((message) => updates(message as Poll)) as Poll;
 
   $pb.BuilderInfo get info_ => _i;
 
   @$core.pragma('dart2js:noInline')
-  static Stream create() => Stream._();
-  Stream createEmptyInstance() => create();
-  static $pb.PbList<Stream> createRepeated() => $pb.PbList<Stream>();
+  static Poll create() => Poll._();
+  Poll createEmptyInstance() => create();
+  static $pb.PbList<Poll> createRepeated() => $pb.PbList<Poll>();
   @$core.pragma('dart2js:noInline')
-  static Stream getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Stream>(create);
-  static Stream? _defaultInstance;
+  static Poll getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Poll>(create);
+  static Poll? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $fixnum.Int64 get id => $_getI64(0);
+  $core.int get id => $_getIZ(0);
   @$pb.TagNumber(1)
-  set id($fixnum.Int64 v) { $_setInt64(0, v); }
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasId() => $_has(0);
   @$pb.TagNumber(1)
   void clearId() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.String get name => $_getSZ(1);
+  $core.int get streamID => $_getIZ(1);
   @$pb.TagNumber(2)
-  set name($core.String v) { $_setString(1, v); }
+  set streamID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
-  $core.bool hasName() => $_has(1);
+  $core.bool hasStreamID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearStreamID() => clearField(2);
 
   @$pb.TagNumber(3)
-  $core.String get description => $_getSZ(2);
+  $core.String get question => $_getSZ(2);
   @$pb.TagNumber(3)
-  set description($core.String v) { $_setString(2, v); }
+  set question($core.String v) {
+    $_setString(2, v);
+  }
+
   @$pb.TagNumber(3)
-  $core.bool hasDescription() => $_has(2);
+  $core.bool hasQuestion() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDescription() => clearField(3);
+  void clearQuestion() => clearField(3);
 
   @$pb.TagNumber(4)
-  $core.int get courseID => $_getIZ(3);
+  $core.bool get active => $_getBF(3);
   @$pb.TagNumber(4)
-  set courseID($core.int v) { $_setUnsignedInt32(3, v); }
+  set active($core.bool v) {
+    $_setBool(3, v);
+  }
+
   @$pb.TagNumber(4)
-  $core.bool hasCourseID() => $_has(3);
+  $core.bool hasActive() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCourseID() => clearField(4);
+  void clearActive() => clearField(4);
 
   @$pb.TagNumber(5)
-  $1.Timestamp get start => $_getN(4);
-  @$pb.TagNumber(5)
-  set start($1.Timestamp v) { setField(5, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasStart() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearStart() => clearField(5);
-  @$pb.TagNumber(5)
-  $1.Timestamp ensureStart() => $_ensure(4);
+  $core.List<PollOption> get pollOptions => $_getList(4);
+}
 
-  @$pb.TagNumber(6)
-  $1.Timestamp get end => $_getN(5);
-  @$pb.TagNumber(6)
-  set end($1.Timestamp v) { setField(6, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasEnd() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearEnd() => clearField(6);
-  @$pb.TagNumber(6)
-  $1.Timestamp ensureEnd() => $_ensure(5);
+class PollOption extends $pb.GeneratedMessage {
+  factory PollOption({
+    $core.int? id,
+    $core.String? answer,
+    $core.int? votes,
+    $core.bool? voted,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (answer != null) {
+      $result.answer = answer;
+    }
+    if (votes != null) {
+      $result.votes = votes;
+    }
+    if (voted != null) {
+      $result.voted = voted;
+    }
+    return $result;
+  }
+  PollOption._() : super();
+
+  factory PollOption.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PollOption.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PollOption',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'answer')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'votes', $pb.PbFieldType.OU3)
+    ..aOB(4, _omitFieldNames ? '' : 'voted')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PollOption clone() => PollOption()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PollOption copyWith(void Function(PollOption) updates) =>
+      super.copyWith((message) => updates(message as PollOption)) as PollOption;
 
-  @$pb.TagNumber(7)
-  $core.bool get chatEnabled => $_getBF(6);
-  @$pb.TagNumber(7)
-  set chatEnabled($core.bool v) { $_setBool(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasChatEnabled() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearChatEnabled() => clearField(7);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(8)
-  $core.String get roomName => $_getSZ(7);
-  @$pb.TagNumber(8)
-  set roomName($core.String v) { $_setString(7, v); }
-  @$pb.TagNumber(8)
-  $core.bool hasRoomName() => $_has(7);
-  @$pb.TagNumber(8)
-  void clearRoomName() => clearField(8);
+  @$core.pragma('dart2js:noInline')
+  static PollOption create() => PollOption._();
+  PollOption createEmptyInstance() => create();
+  static $pb.PbList<PollOption> createRepeated() => $pb.PbList<PollOption>();
+  @$core.pragma('dart2js:noInline')
+  static PollOption getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PollOption>(create);
+  static PollOption? _defaultInstance;
 
-  @$pb.TagNumber(9)
-  $core.String get roomCode => $_getSZ(8);
-  @$pb.TagNumber(9)
-  set roomCode($core.String v) { $_setString(8, v); }
-  @$pb.TagNumber(9)
-  $core.bool hasRoomCode() => $_has(8);
-  @$pb.TagNumber(9)
-  void clearRoomCode() => clearField(9);
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
 
-  @$pb.TagNumber(10)
-  $core.String get eventTypeName => $_getSZ(9);
-  @$pb.TagNumber(10)
-  set eventTypeName($core.String v) { $_setString(9, v); }
-  @$pb.TagNumber(10)
-  $core.bool hasEventTypeName() => $_has(9);
-  @$pb.TagNumber(10)
-  void clearEventTypeName() => clearField(10);
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
 
-  @$pb.TagNumber(11)
-  $core.int get tUMOnlineEventID => $_getIZ(10);
-  @$pb.TagNumber(11)
-  set tUMOnlineEventID($core.int v) { $_setUnsignedInt32(10, v); }
-  @$pb.TagNumber(11)
-  $core.bool hasTUMOnlineEventID() => $_has(10);
-  @$pb.TagNumber(11)
-  void clearTUMOnlineEventID() => clearField(11);
+  @$pb.TagNumber(2)
+  $core.String get answer => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set answer($core.String v) {
+    $_setString(1, v);
+  }
 
-  @$pb.TagNumber(12)
-  $core.String get seriesIdentifier => $_getSZ(11);
-  @$pb.TagNumber(12)
-  set seriesIdentifier($core.String v) { $_setString(11, v); }
-  @$pb.TagNumber(12)
-  $core.bool hasSeriesIdentifier() => $_has(11);
-  @$pb.TagNumber(12)
-  void clearSeriesIdentifier() => clearField(12);
+  @$pb.TagNumber(2)
+  $core.bool hasAnswer() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearAnswer() => clearField(2);
 
-  @$pb.TagNumber(13)
-  $core.String get playlistUrl => $_getSZ(12);
-  @$pb.TagNumber(13)
-  set playlistUrl($core.String v) { $_setString(12, v); }
-  @$pb.TagNumber(13)
-  $core.bool hasPlaylistUrl() => $_has(12);
-  @$pb.TagNumber(13)
-  void clearPlaylistUrl() => clearField(13);
+  @$pb.TagNumber(3)
+  $core.int get votes => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set votes($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
 
-  @$pb.TagNumber(14)
-  $core.String get playlistUrlPRES => $_getSZ(13);
-  @$pb.TagNumber(14)
-  set playlistUrlPRES($core.String v) { $_setString(13, v); }
-  @$pb.TagNumber(14)
-  $core.bool hasPlaylistUrlPRES() => $_has(13);
-  @$pb.TagNumber(14)
-  void clearPlaylistUrlPRES() => clearField(14);
+  @$pb.TagNumber(3)
+  $core.bool hasVotes() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearVotes() => clearField(3);
 
-  @$pb.TagNumber(15)
-  $core.String get playlistUrlCAM => $_getSZ(14);
-  @$pb.TagNumber(15)
-  set playlistUrlCAM($core.String v) { $_setString(14, v); }
-  @$pb.TagNumber(15)
-  $core.bool hasPlaylistUrlCAM() => $_has(14);
-  @$pb.TagNumber(15)
-  void clearPlaylistUrlCAM() => clearField(15);
+  @$pb.TagNumber(4)
+  $core.bool get voted => $_getBF(3);
+  @$pb.TagNumber(4)
+  set voted($core.bool v) {
+    $_setBool(3, v);
+  }
 
-  @$pb.TagNumber(16)
-  $core.bool get liveNow => $_getBF(15);
-  @$pb.TagNumber(16)
-  set liveNow($core.bool v) { $_setBool(15, v); }
-  @$pb.TagNumber(16)
-  $core.bool hasLiveNow() => $_has(15);
-  @$pb.TagNumber(16)
-  void clearLiveNow() => clearField(16);
+  @$pb.TagNumber(4)
+  $core.bool hasVoted() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearVoted() => clearField(4);
+}
 
-  @$pb.TagNumber(17)
-  $1.Timestamp get liveNowTimestamp => $_getN(16);
-  @$pb.TagNumber(17)
-  set liveNowTimestamp($1.Timestamp v) { setField(17, v); }
-  @$pb.TagNumber(17)
-  $core.bool hasLiveNowTimestamp() => $_has(16);
-  @$pb.TagNumber(17)
-  void clearLiveNowTimestamp() => clearField(17);
-  @$pb.TagNumber(17)
-  $1.Timestamp ensureLiveNowTimestamp() => $_ensure(16);
+class GetPollsRequest extends $pb.GeneratedMessage {
+  factory GetPollsRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  GetPollsRequest._() : super();
+
+  factory GetPollsRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetPollsRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetPollsRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetPollsRequest clone() => GetPollsRequest()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetPollsRequest copyWith(void Function(GetPollsRequest) updates) =>
+      super.copyWith((message) => updates(message as GetPollsRequest))
+          as GetPollsRequest;
 
-  @$pb.TagNumber(18)
-  $core.bool get recording => $_getBF(17);
-  @$pb.TagNumber(18)
-  set recording($core.bool v) { $_setBool(17, v); }
-  @$pb.TagNumber(18)
-  $core.bool hasRecording() => $_has(17);
-  @$pb.TagNumber(18)
-  void clearRecording() => clearField(18);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(19)
-  $core.bool get premiere => $_getBF(18);
-  @$pb.TagNumber(19)
-  set premiere($core.bool v) { $_setBool(18, v); }
-  @$pb.TagNumber(19)
-  $core.bool hasPremiere() => $_has(18);
-  @$pb.TagNumber(19)
-  void clearPremiere() => clearField(19);
+  @$core.pragma('dart2js:noInline')
+  static GetPollsRequest create() => GetPollsRequest._();
+  GetPollsRequest createEmptyInstance() => create();
+  static $pb.PbList<GetPollsRequest> createRepeated() =>
+      $pb.PbList<GetPollsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetPollsRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetPollsRequest>(create);
+  static GetPollsRequest? _defaultInstance;
 
-  @$pb.TagNumber(20)
-  $core.bool get ended => $_getBF(19);
-  @$pb.TagNumber(20)
-  set ended($core.bool v) { $_setBool(19, v); }
-  @$pb.TagNumber(20)
-  $core.bool hasEnded() => $_has(19);
-  @$pb.TagNumber(20)
-  void clearEnded() => clearField(20);
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
 
-  @$pb.TagNumber(21)
-  $core.int get vodViews => $_getIZ(20);
-  @$pb.TagNumber(21)
-  set vodViews($core.int v) { $_setUnsignedInt32(20, v); }
-  @$pb.TagNumber(21)
-  $core.bool hasVodViews() => $_has(20);
-  @$pb.TagNumber(21)
-  void clearVodViews() => clearField(21);
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
 
-  @$pb.TagNumber(22)
-  $core.int get startOffset => $_getIZ(21);
-  @$pb.TagNumber(22)
-  set startOffset($core.int v) { $_setUnsignedInt32(21, v); }
-  @$pb.TagNumber(22)
-  $core.bool hasStartOffset() => $_has(21);
-  @$pb.TagNumber(22)
-  void clearStartOffset() => clearField(22);
+class PostPollVoteRequest extends $pb.GeneratedMessage {
+  factory PostPollVoteRequest({
+    $core.int? streamID,
+    $core.int? pollOptionID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    if (pollOptionID != null) {
+      $result.pollOptionID = pollOptionID;
+    }
+    return $result;
+  }
+  PostPollVoteRequest._() : super();
+
+  factory PostPollVoteRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostPollVoteRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostPollVoteRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..a<$core.int>(
+        2, _omitFieldNames ? '' : 'pollOptionID', $pb.PbFieldType.OU3,
+      protoName: 'pollOptionID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostPollVoteRequest clone() => PostPollVoteRequest()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostPollVoteRequest copyWith(void Function(PostPollVoteRequest) updates) =>
+      super.copyWith((message) => updates(message as PostPollVoteRequest))
+          as PostPollVoteRequest;
 
-  @$pb.TagNumber(23)
-  $core.int get endOffset => $_getIZ(22);
-  @$pb.TagNumber(23)
-  set endOffset($core.int v) { $_setUnsignedInt32(22, v); }
-  @$pb.TagNumber(23)
-  $core.bool hasEndOffset() => $_has(22);
-  @$pb.TagNumber(23)
-  void clearEndOffset() => clearField(23);
+  $pb.BuilderInfo get info_ => _i;
 
-  @$pb.TagNumber(28)
-  $core.int get duration => $_getIZ(23);
-  @$pb.TagNumber(28)
-  set duration($core.int v) { $_setSignedInt32(23, v); }
-  @$pb.TagNumber(28)
-  $core.bool hasDuration() => $_has(23);
-  @$pb.TagNumber(28)
-  void clearDuration() => clearField(28);
+  @$core.pragma('dart2js:noInline')
+  static PostPollVoteRequest create() => PostPollVoteRequest._();
+  PostPollVoteRequest createEmptyInstance() => create();
+  static $pb.PbList<PostPollVoteRequest> createRepeated() =>
+      $pb.PbList<PostPollVoteRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PostPollVoteRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostPollVoteRequest>(create);
+  static PostPollVoteRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get pollOptionID => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set pollOptionID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasPollOptionID() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearPollOptionID() => clearField(2);
 }
 
+class GetPollsResponse extends $pb.GeneratedMessage {
+  factory GetPollsResponse({
+    $core.Iterable<Poll>? polls,
+  }) {
+    final $result = create();
+    if (polls != null) {
+      $result.polls.addAll(polls);
+    }
+    return $result;
+  }
+  GetPollsResponse._() : super();
+
+  factory GetPollsResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetPollsResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetPollsResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Poll>(1, _omitFieldNames ? '' : 'polls', $pb.PbFieldType.PM,
+      subBuilder: Poll.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetPollsResponse clone() => GetPollsResponse()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetPollsResponse copyWith(void Function(GetPollsResponse) updates) =>
+      super.copyWith((message) => updates(message as GetPollsResponse))
+          as GetPollsResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetPollsResponse create() => GetPollsResponse._();
+  GetPollsResponse createEmptyInstance() => create();
+  static $pb.PbList<GetPollsResponse> createRepeated() =>
+      $pb.PbList<GetPollsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetPollsResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetPollsResponse>(create);
+  static GetPollsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Poll> get polls => $_getList(0);
+}
+
+class PostPollVoteResponse extends $pb.GeneratedMessage {
+  factory PostPollVoteResponse() => create();
+  PostPollVoteResponse._() : super();
+
+  factory PostPollVoteResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostPollVoteResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostPollVoteResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostPollVoteResponse clone() =>
+      PostPollVoteResponse()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostPollVoteResponse copyWith(void Function(PostPollVoteResponse) updates) =>
+      super.copyWith((message) => updates(message as PostPollVoteResponse))
+          as PostPollVoteResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PostPollVoteResponse create() => PostPollVoteResponse._();
+  PostPollVoteResponse createEmptyInstance() => create();
+  static $pb.PbList<PostPollVoteResponse> createRepeated() =>
+      $pb.PbList<PostPollVoteResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PostPollVoteResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostPollVoteResponse>(create);
+  static PostPollVoteResponse? _defaultInstance;
+}
+
+class User extends $pb.GeneratedMessage {
+  factory User({
+    $core.int? id,
+    $core.String? name,
+    $core.String? lastName,
+    $core.String? email,
+    $core.String? matriculationNumber,
+    $core.String? lrzID,
+    $core.int? role,
+    $core.Iterable<Course>? courses,
+    $core.Iterable<Course>? administeredCourses,
+    $core.Iterable<Course>? pinnedCourses,
+    $core.Iterable<UserSetting>? settings,
+    $core.Iterable<Bookmark>? bookmarks,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (lastName != null) {
+      $result.lastName = lastName;
+    }
+    if (email != null) {
+      $result.email = email;
+    }
+    if (matriculationNumber != null) {
+      $result.matriculationNumber = matriculationNumber;
+    }
+    if (lrzID != null) {
+      $result.lrzID = lrzID;
+    }
+    if (role != null) {
+      $result.role = role;
+    }
+    if (courses != null) {
+      $result.courses.addAll(courses);
+    }
+    if (administeredCourses != null) {
+      $result.administeredCourses.addAll(administeredCourses);
+    }
+    if (pinnedCourses != null) {
+      $result.pinnedCourses.addAll(pinnedCourses);
+    }
+    if (settings != null) {
+      $result.settings.addAll(settings);
+    }
+    if (bookmarks != null) {
+      $result.bookmarks.addAll(bookmarks);
+    }
+    return $result;
+  }
+  User._() : super();
+
+  factory User.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory User.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'User',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..aOS(3, _omitFieldNames ? '' : 'lastName', protoName: 'lastName')
+    ..aOS(4, _omitFieldNames ? '' : 'email')..aOS(
+        5, _omitFieldNames ? '' : 'matriculationNumber',
+      protoName: 'matriculationNumber',
+    )
+    ..aOS(6, _omitFieldNames ? '' : 'lrzID', protoName: 'lrzID')
+    ..a<$core.int>(7, _omitFieldNames ? '' : 'role', $pb.PbFieldType.OU3)
+    ..pc<Course>(8, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM,
+      subBuilder: Course.create,
+    )
+    ..pc<Course>(
+        9, _omitFieldNames ? '' : 'administeredCourses', $pb.PbFieldType.PM,
+      protoName: 'administeredCourses',
+      subBuilder: Course.create,
+    )
+    ..pc<Course>(10, _omitFieldNames ? '' : 'pinnedCourses', $pb.PbFieldType.PM,
+      protoName: 'pinnedCourses',
+      subBuilder: Course.create,
+    )
+    ..pc<UserSetting>(11, _omitFieldNames ? '' : 'settings', $pb.PbFieldType.PM,
+      subBuilder: UserSetting.create,
+    )
+    ..pc<Bookmark>(12, _omitFieldNames ? '' : 'bookmarks', $pb.PbFieldType.PM,
+      subBuilder: Bookmark.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  User clone() => User()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  User copyWith(void Function(User) updates) =>
+      super.copyWith((message) => updates(message as User)) as User;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static User create() => User._();
+  User createEmptyInstance() => create();
+  static $pb.PbList<User> createRepeated() => $pb.PbList<User>();
+  @$core.pragma('dart2js:noInline')
+  static User getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<User>(create);
+  static User? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get name => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set name($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearName() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get lastName => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set lastName($core.String v) {
+    $_setString(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasLastName() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearLastName() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get email => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set email($core.String v) {
+    $_setString(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasEmail() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearEmail() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.String get matriculationNumber => $_getSZ(4);
+  @$pb.TagNumber(5)
+  set matriculationNumber($core.String v) {
+    $_setString(4, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasMatriculationNumber() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearMatriculationNumber() => clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.String get lrzID => $_getSZ(5);
+  @$pb.TagNumber(6)
+  set lrzID($core.String v) {
+    $_setString(5, v);
+  }
+
+  @$pb.TagNumber(6)
+  $core.bool hasLrzID() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearLrzID() => clearField(6);
+
+  @$pb.TagNumber(7)
+  $core.int get role => $_getIZ(6);
+  @$pb.TagNumber(7)
+  set role($core.int v) {
+    $_setUnsignedInt32(6, v);
+  }
+
+  @$pb.TagNumber(7)
+  $core.bool hasRole() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearRole() => clearField(7);
+
+  @$pb.TagNumber(8)
+  $core.List<Course> get courses => $_getList(7);
+
+  @$pb.TagNumber(9)
+  $core.List<Course> get administeredCourses => $_getList(8);
+
+  @$pb.TagNumber(10)
+  $core.List<Course> get pinnedCourses => $_getList(9);
+
+  @$pb.TagNumber(11)
+  $core.List<UserSetting> get settings => $_getList(10);
+
+  @$pb.TagNumber(12)
+  $core.List<Bookmark> get bookmarks => $_getList(11);
+}
+
+class UserSetting extends $pb.GeneratedMessage {
+  factory UserSetting({
+    UserSettingType? type,
+    $core.String? value,
+  }) {
+    final $result = create();
+    if (type != null) {
+      $result.type = type;
+    }
+    if (value != null) {
+      $result.value = value;
+    }
+    return $result;
+  }
+  UserSetting._() : super();
+
+  factory UserSetting.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory UserSetting.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UserSetting',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..e<UserSettingType>(3, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
+        defaultOrMaker: UserSettingType.PREFERRED_NAME,
+        valueOf: UserSettingType.valueOf,
+      enumValues: UserSettingType.values,
+    )
+    ..aOS(4, _omitFieldNames ? '' : 'value')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  UserSetting clone() => UserSetting()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  UserSetting copyWith(void Function(UserSetting) updates) =>
+      super.copyWith((message) => updates(message as UserSetting))
+          as UserSetting;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserSetting create() => UserSetting._();
+  UserSetting createEmptyInstance() => create();
+  static $pb.PbList<UserSetting> createRepeated() => $pb.PbList<UserSetting>();
+  @$core.pragma('dart2js:noInline')
+  static UserSetting getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<UserSetting>(create);
+  static UserSetting? _defaultInstance;
+
+  @$pb.TagNumber(3)
+  UserSettingType get type => $_getN(0);
+  @$pb.TagNumber(3)
+  set type(UserSettingType v) {
+    setField(3, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(3)
+  void clearType() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get value => $_getSZ(1);
+  @$pb.TagNumber(4)
+  set value($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasValue() => $_has(1);
+  @$pb.TagNumber(4)
+  void clearValue() => clearField(4);
+}
+
+class GetUserRequest extends $pb.GeneratedMessage {
+  factory GetUserRequest() => create();
+  GetUserRequest._() : super();
+
+  factory GetUserRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserRequest clone() => GetUserRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserRequest copyWith(void Function(GetUserRequest) updates) =>
+      super.copyWith((message) => updates(message as GetUserRequest))
+          as GetUserRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserRequest create() => GetUserRequest._();
+  GetUserRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserRequest> createRepeated() =>
+      $pb.PbList<GetUserRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserRequest>(create);
+  static GetUserRequest? _defaultInstance;
+}
+
+class GetUserCoursesRequest extends $pb.GeneratedMessage {
+  factory GetUserCoursesRequest({
+    $core.int? year,
+    $core.String? term,
+    $core.int? limit,
+    $core.int? skip,
+  }) {
+    final $result = create();
+    if (year != null) {
+      $result.year = year;
+    }
+    if (term != null) {
+      $result.term = term;
+    }
+    if (limit != null) {
+      $result.limit = limit;
+    }
+    if (skip != null) {
+      $result.skip = skip;
+    }
+    return $result;
+  }
+  GetUserCoursesRequest._() : super();
+
+  factory GetUserCoursesRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserCoursesRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserCoursesRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'year', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'term')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'limit', $pb.PbFieldType.OU3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'skip', $pb.PbFieldType.OU3)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserCoursesRequest clone() =>
+      GetUserCoursesRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserCoursesRequest copyWith(
+    void Function(GetUserCoursesRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetUserCoursesRequest))
+          as GetUserCoursesRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserCoursesRequest create() => GetUserCoursesRequest._();
+  GetUserCoursesRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserCoursesRequest> createRepeated() =>
+      $pb.PbList<GetUserCoursesRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserCoursesRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserCoursesRequest>(create);
+  static GetUserCoursesRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get year => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set year($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasYear() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearYear() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get term => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set term($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasTerm() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearTerm() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get limit => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set limit($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasLimit() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearLimit() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get skip => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set skip($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasSkip() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSkip() => clearField(4);
+}
+
+class GetUserPinnedRequest extends $pb.GeneratedMessage {
+  factory GetUserPinnedRequest({
+    $core.int? year,
+    $core.String? term,
+    $core.int? limit,
+    $core.int? skip,
+  }) {
+    final $result = create();
+    if (year != null) {
+      $result.year = year;
+    }
+    if (term != null) {
+      $result.term = term;
+    }
+    if (limit != null) {
+      $result.limit = limit;
+    }
+    if (skip != null) {
+      $result.skip = skip;
+    }
+    return $result;
+  }
+  GetUserPinnedRequest._() : super();
+
+  factory GetUserPinnedRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserPinnedRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserPinnedRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'year', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'term')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'limit', $pb.PbFieldType.OU3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'skip', $pb.PbFieldType.OU3)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserPinnedRequest clone() =>
+      GetUserPinnedRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserPinnedRequest copyWith(void Function(GetUserPinnedRequest) updates) =>
+      super.copyWith((message) => updates(message as GetUserPinnedRequest))
+          as GetUserPinnedRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserPinnedRequest create() => GetUserPinnedRequest._();
+  GetUserPinnedRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserPinnedRequest> createRepeated() =>
+      $pb.PbList<GetUserPinnedRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserPinnedRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserPinnedRequest>(create);
+  static GetUserPinnedRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get year => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set year($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasYear() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearYear() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get term => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set term($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasTerm() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearTerm() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get limit => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set limit($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasLimit() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearLimit() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get skip => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set skip($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasSkip() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSkip() => clearField(4);
+}
+
+class GetUserAdminRequest extends $pb.GeneratedMessage {
+  factory GetUserAdminRequest() => create();
+  GetUserAdminRequest._() : super();
+
+  factory GetUserAdminRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserAdminRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserAdminRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserAdminRequest clone() => GetUserAdminRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserAdminRequest copyWith(void Function(GetUserAdminRequest) updates) =>
+      super.copyWith((message) => updates(message as GetUserAdminRequest))
+          as GetUserAdminRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserAdminRequest create() => GetUserAdminRequest._();
+  GetUserAdminRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserAdminRequest> createRepeated() =>
+      $pb.PbList<GetUserAdminRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserAdminRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserAdminRequest>(create);
+  static GetUserAdminRequest? _defaultInstance;
+}
+
+class GetUserSettingsRequest extends $pb.GeneratedMessage {
+  factory GetUserSettingsRequest() => create();
+  GetUserSettingsRequest._() : super();
+
+  factory GetUserSettingsRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserSettingsRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserSettingsRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserSettingsRequest clone() =>
+      GetUserSettingsRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserSettingsRequest copyWith(
+    void Function(GetUserSettingsRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetUserSettingsRequest))
+          as GetUserSettingsRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserSettingsRequest create() => GetUserSettingsRequest._();
+  GetUserSettingsRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserSettingsRequest> createRepeated() =>
+      $pb.PbList<GetUserSettingsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserSettingsRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserSettingsRequest>(create);
+  static GetUserSettingsRequest? _defaultInstance;
+}
+
+class PatchUserSettingsRequest extends $pb.GeneratedMessage {
+  factory PatchUserSettingsRequest({
+    $core.Iterable<UserSetting>? userSettings,
+  }) {
+    final $result = create();
+    if (userSettings != null) {
+      $result.userSettings.addAll(userSettings);
+    }
+    return $result;
+  }
+  PatchUserSettingsRequest._() : super();
+
+  factory PatchUserSettingsRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PatchUserSettingsRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PatchUserSettingsRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<UserSetting>(
+        1, _omitFieldNames ? '' : 'userSettings', $pb.PbFieldType.PM,
+      protoName: 'userSettings',
+      subBuilder: UserSetting.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PatchUserSettingsRequest clone() =>
+      PatchUserSettingsRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PatchUserSettingsRequest copyWith(
+    void Function(PatchUserSettingsRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PatchUserSettingsRequest))
+          as PatchUserSettingsRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PatchUserSettingsRequest create() => PatchUserSettingsRequest._();
+  PatchUserSettingsRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PatchUserSettingsRequest> createRepeated() =>
+      $pb.PbList<PatchUserSettingsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PatchUserSettingsRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PatchUserSettingsRequest>(create);
+  static PatchUserSettingsRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<UserSetting> get userSettings => $_getList(0);
+}
+
+class PatchUserSettingsResponse extends $pb.GeneratedMessage {
+  factory PatchUserSettingsResponse({
+    $core.Iterable<UserSetting>? userSettings,
+  }) {
+    final $result = create();
+    if (userSettings != null) {
+      $result.userSettings.addAll(userSettings);
+    }
+    return $result;
+  }
+  PatchUserSettingsResponse._() : super();
+
+  factory PatchUserSettingsResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PatchUserSettingsResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PatchUserSettingsResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<UserSetting>(
+        1, _omitFieldNames ? '' : 'userSettings', $pb.PbFieldType.PM,
+      protoName: 'userSettings',
+      subBuilder: UserSetting.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PatchUserSettingsResponse clone() =>
+      PatchUserSettingsResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PatchUserSettingsResponse copyWith(
+    void Function(PatchUserSettingsResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PatchUserSettingsResponse))
+          as PatchUserSettingsResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PatchUserSettingsResponse create() => PatchUserSettingsResponse._();
+  PatchUserSettingsResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PatchUserSettingsResponse> createRepeated() =>
+      $pb.PbList<PatchUserSettingsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PatchUserSettingsResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PatchUserSettingsResponse>(create);
+  static PatchUserSettingsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<UserSetting> get userSettings => $_getList(0);
+}
+
+class PostPinnedRequest extends $pb.GeneratedMessage {
+  factory PostPinnedRequest({
+    $core.int? courseID,
+  }) {
+    final $result = create();
+    if (courseID != null) {
+      $result.courseID = courseID;
+    }
+    return $result;
+  }
+  PostPinnedRequest._() : super();
+
+  factory PostPinnedRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostPinnedRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostPinnedRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'courseID', $pb.PbFieldType.OU3,
+      protoName: 'courseID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostPinnedRequest clone() => PostPinnedRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostPinnedRequest copyWith(void Function(PostPinnedRequest) updates) =>
+      super.copyWith((message) => updates(message as PostPinnedRequest))
+          as PostPinnedRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PostPinnedRequest create() => PostPinnedRequest._();
+  PostPinnedRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PostPinnedRequest> createRepeated() =>
+      $pb.PbList<PostPinnedRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PostPinnedRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostPinnedRequest>(create);
+  static PostPinnedRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get courseID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set courseID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasCourseID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCourseID() => clearField(1);
+}
+
+class DeletePinnedRequest extends $pb.GeneratedMessage {
+  factory DeletePinnedRequest({
+    $core.int? courseID,
+  }) {
+    final $result = create();
+    if (courseID != null) {
+      $result.courseID = courseID;
+    }
+    return $result;
+  }
+  DeletePinnedRequest._() : super();
+
+  factory DeletePinnedRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeletePinnedRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeletePinnedRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'courseID', $pb.PbFieldType.OU3,
+      protoName: 'courseID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeletePinnedRequest clone() => DeletePinnedRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeletePinnedRequest copyWith(void Function(DeletePinnedRequest) updates) =>
+      super.copyWith((message) => updates(message as DeletePinnedRequest))
+          as DeletePinnedRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeletePinnedRequest create() => DeletePinnedRequest._();
+  DeletePinnedRequest createEmptyInstance() => create();
+
+  static $pb.PbList<DeletePinnedRequest> createRepeated() =>
+      $pb.PbList<DeletePinnedRequest>();
+  @$core.pragma('dart2js:noInline')
+  static DeletePinnedRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeletePinnedRequest>(create);
+  static DeletePinnedRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get courseID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set courseID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasCourseID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCourseID() => clearField(1);
+}
+
+class GetUserResponse extends $pb.GeneratedMessage {
+  factory GetUserResponse({
+    User? user,
+  }) {
+    final $result = create();
+    if (user != null) {
+      $result.user = user;
+    }
+    return $result;
+  }
+  GetUserResponse._() : super();
+
+  factory GetUserResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<User>(1, _omitFieldNames ? '' : 'user', subBuilder: User.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserResponse clone() => GetUserResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserResponse copyWith(void Function(GetUserResponse) updates) =>
+      super.copyWith((message) => updates(message as GetUserResponse))
+          as GetUserResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserResponse create() => GetUserResponse._();
+  GetUserResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserResponse> createRepeated() =>
+      $pb.PbList<GetUserResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserResponse>(create);
+  static GetUserResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  User get user => $_getN(0);
+  @$pb.TagNumber(1)
+  set user(User v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasUser() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearUser() => clearField(1);
+  @$pb.TagNumber(1)
+  User ensureUser() => $_ensure(0);
+}
+
+class GetUserCoursesResponse extends $pb.GeneratedMessage {
+  factory GetUserCoursesResponse({
+    $core.Iterable<Course>? courses,
+  }) {
+    final $result = create();
+    if (courses != null) {
+      $result.courses.addAll(courses);
+    }
+    return $result;
+  }
+  GetUserCoursesResponse._() : super();
+
+  factory GetUserCoursesResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserCoursesResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserCoursesResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM,
+      subBuilder: Course.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserCoursesResponse clone() =>
+      GetUserCoursesResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserCoursesResponse copyWith(
+    void Function(GetUserCoursesResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetUserCoursesResponse))
+          as GetUserCoursesResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserCoursesResponse create() => GetUserCoursesResponse._();
+  GetUserCoursesResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserCoursesResponse> createRepeated() =>
+      $pb.PbList<GetUserCoursesResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserCoursesResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserCoursesResponse>(create);
+  static GetUserCoursesResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Course> get courses => $_getList(0);
+}
+
+class GetUserPinnedResponse extends $pb.GeneratedMessage {
+  factory GetUserPinnedResponse({
+    $core.Iterable<Course>? courses,
+  }) {
+    final $result = create();
+    if (courses != null) {
+      $result.courses.addAll(courses);
+    }
+    return $result;
+  }
+  GetUserPinnedResponse._() : super();
+
+  factory GetUserPinnedResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserPinnedResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserPinnedResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM,
+      subBuilder: Course.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserPinnedResponse clone() =>
+      GetUserPinnedResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserPinnedResponse copyWith(
+    void Function(GetUserPinnedResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetUserPinnedResponse))
+          as GetUserPinnedResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserPinnedResponse create() => GetUserPinnedResponse._();
+  GetUserPinnedResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserPinnedResponse> createRepeated() =>
+      $pb.PbList<GetUserPinnedResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserPinnedResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserPinnedResponse>(create);
+  static GetUserPinnedResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Course> get courses => $_getList(0);
+}
+
+class GetUserAdminResponse extends $pb.GeneratedMessage {
+  factory GetUserAdminResponse({
+    $core.Iterable<Course>? courses,
+  }) {
+    final $result = create();
+    if (courses != null) {
+      $result.courses.addAll(courses);
+    }
+    return $result;
+  }
+  GetUserAdminResponse._() : super();
+
+  factory GetUserAdminResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserAdminResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserAdminResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM,
+      subBuilder: Course.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserAdminResponse clone() =>
+      GetUserAdminResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserAdminResponse copyWith(void Function(GetUserAdminResponse) updates) =>
+      super.copyWith((message) => updates(message as GetUserAdminResponse))
+          as GetUserAdminResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserAdminResponse create() => GetUserAdminResponse._();
+  GetUserAdminResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserAdminResponse> createRepeated() =>
+      $pb.PbList<GetUserAdminResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserAdminResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserAdminResponse>(create);
+  static GetUserAdminResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Course> get courses => $_getList(0);
+}
+
+class GetUserSettingsResponse extends $pb.GeneratedMessage {
+  factory GetUserSettingsResponse({
+    $core.Iterable<UserSetting>? userSettings,
+  }) {
+    final $result = create();
+    if (userSettings != null) {
+      $result.userSettings.addAll(userSettings);
+    }
+    return $result;
+  }
+  GetUserSettingsResponse._() : super();
+
+  factory GetUserSettingsResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetUserSettingsResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetUserSettingsResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<UserSetting>(
+        1, _omitFieldNames ? '' : 'userSettings', $pb.PbFieldType.PM,
+      protoName: 'userSettings',
+      subBuilder: UserSetting.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetUserSettingsResponse clone() =>
+      GetUserSettingsResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetUserSettingsResponse copyWith(
+    void Function(GetUserSettingsResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetUserSettingsResponse))
+          as GetUserSettingsResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetUserSettingsResponse create() => GetUserSettingsResponse._();
+  GetUserSettingsResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetUserSettingsResponse> createRepeated() =>
+      $pb.PbList<GetUserSettingsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetUserSettingsResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetUserSettingsResponse>(create);
+  static GetUserSettingsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<UserSetting> get userSettings => $_getList(0);
+}
+
+class PostPinnedResponse extends $pb.GeneratedMessage {
+  factory PostPinnedResponse() => create();
+  PostPinnedResponse._() : super();
+
+  factory PostPinnedResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostPinnedResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostPinnedResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostPinnedResponse clone() => PostPinnedResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostPinnedResponse copyWith(void Function(PostPinnedResponse) updates) =>
+      super.copyWith((message) => updates(message as PostPinnedResponse))
+          as PostPinnedResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PostPinnedResponse create() => PostPinnedResponse._();
+  PostPinnedResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PostPinnedResponse> createRepeated() =>
+      $pb.PbList<PostPinnedResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PostPinnedResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostPinnedResponse>(create);
+  static PostPinnedResponse? _defaultInstance;
+}
+
+class DeletePinnedResponse extends $pb.GeneratedMessage {
+  factory DeletePinnedResponse() => create();
+  DeletePinnedResponse._() : super();
+
+  factory DeletePinnedResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeletePinnedResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeletePinnedResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeletePinnedResponse clone() =>
+      DeletePinnedResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeletePinnedResponse copyWith(void Function(DeletePinnedResponse) updates) =>
+      super.copyWith((message) => updates(message as DeletePinnedResponse))
+          as DeletePinnedResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeletePinnedResponse create() => DeletePinnedResponse._();
+  DeletePinnedResponse createEmptyInstance() => create();
+
+  static $pb.PbList<DeletePinnedResponse> createRepeated() =>
+      $pb.PbList<DeletePinnedResponse>();
+  @$core.pragma('dart2js:noInline')
+  static DeletePinnedResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeletePinnedResponse>(create);
+  static DeletePinnedResponse? _defaultInstance;
+}
+
+class Bookmark extends $pb.GeneratedMessage {
+  factory Bookmark({
+    $core.int? id,
+    $core.String? description,
+    $core.int? hours,
+    $core.int? minutes,
+    $core.int? seconds,
+    $core.int? userID,
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (description != null) {
+      $result.description = description;
+    }
+    if (hours != null) {
+      $result.hours = hours;
+    }
+    if (minutes != null) {
+      $result.minutes = minutes;
+    }
+    if (seconds != null) {
+      $result.seconds = seconds;
+    }
+    if (userID != null) {
+      $result.userID = userID;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  Bookmark._() : super();
+
+  factory Bookmark.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Bookmark.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Bookmark',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'description')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'hours', $pb.PbFieldType.OU3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'minutes', $pb.PbFieldType.OU3)
+    ..a<$core.int>(5, _omitFieldNames ? '' : 'seconds', $pb.PbFieldType.OU3)..a<
+        $core.int>(6, _omitFieldNames ? '' : 'userID', $pb.PbFieldType.OU3,
+      protoName: 'userID',
+    )
+    ..a<$core.int>(
+      7,
+      _omitFieldNames ? '' : 'streamID',
+      $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Bookmark clone() => Bookmark()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Bookmark copyWith(void Function(Bookmark) updates) =>
+      super.copyWith((message) => updates(message as Bookmark)) as Bookmark;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Bookmark create() => Bookmark._();
+  Bookmark createEmptyInstance() => create();
+  static $pb.PbList<Bookmark> createRepeated() => $pb.PbList<Bookmark>();
+  @$core.pragma('dart2js:noInline')
+  static Bookmark getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Bookmark>(create);
+  static Bookmark? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get description => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set description($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasDescription() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearDescription() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get hours => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set hours($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasHours() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearHours() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get minutes => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set minutes($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasMinutes() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearMinutes() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.int get seconds => $_getIZ(4);
+  @$pb.TagNumber(5)
+  set seconds($core.int v) {
+    $_setUnsignedInt32(4, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasSeconds() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearSeconds() => clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.int get userID => $_getIZ(5);
+  @$pb.TagNumber(6)
+  set userID($core.int v) {
+    $_setUnsignedInt32(5, v);
+  }
+
+  @$pb.TagNumber(6)
+  $core.bool hasUserID() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearUserID() => clearField(6);
+
+  @$pb.TagNumber(7)
+  $core.int get streamID => $_getIZ(6);
+  @$pb.TagNumber(7)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(6, v);
+  }
+
+  @$pb.TagNumber(7)
+  $core.bool hasStreamID() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearStreamID() => clearField(7);
+}
+
+class GetBookmarksRequest extends $pb.GeneratedMessage {
+  factory GetBookmarksRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  GetBookmarksRequest._() : super();
+
+  factory GetBookmarksRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetBookmarksRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetBookmarksRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetBookmarksRequest clone() => GetBookmarksRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetBookmarksRequest copyWith(void Function(GetBookmarksRequest) updates) =>
+      super.copyWith((message) => updates(message as GetBookmarksRequest))
+          as GetBookmarksRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetBookmarksRequest create() => GetBookmarksRequest._();
+  GetBookmarksRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetBookmarksRequest> createRepeated() =>
+      $pb.PbList<GetBookmarksRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetBookmarksRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetBookmarksRequest>(create);
+  static GetBookmarksRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
+
+class PutBookmarkRequest extends $pb.GeneratedMessage {
+  factory PutBookmarkRequest({
+    $core.String? description,
+    $core.int? hours,
+    $core.int? minutes,
+    $core.int? seconds,
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (description != null) {
+      $result.description = description;
+    }
+    if (hours != null) {
+      $result.hours = hours;
+    }
+    if (minutes != null) {
+      $result.minutes = minutes;
+    }
+    if (seconds != null) {
+      $result.seconds = seconds;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  PutBookmarkRequest._() : super();
+
+  factory PutBookmarkRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PutBookmarkRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PutBookmarkRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'description')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'hours', $pb.PbFieldType.OU3)
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'minutes', $pb.PbFieldType.OU3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'seconds', $pb.PbFieldType.OU3)..a<
+        $core.int>(5, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PutBookmarkRequest clone() => PutBookmarkRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PutBookmarkRequest copyWith(void Function(PutBookmarkRequest) updates) =>
+      super.copyWith((message) => updates(message as PutBookmarkRequest))
+          as PutBookmarkRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PutBookmarkRequest create() => PutBookmarkRequest._();
+  PutBookmarkRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PutBookmarkRequest> createRepeated() =>
+      $pb.PbList<PutBookmarkRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PutBookmarkRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PutBookmarkRequest>(create);
+  static PutBookmarkRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get description => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set description($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasDescription() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearDescription() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get hours => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set hours($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasHours() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearHours() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get minutes => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set minutes($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasMinutes() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearMinutes() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get seconds => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set seconds($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasSeconds() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSeconds() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.int get streamID => $_getIZ(4);
+  @$pb.TagNumber(5)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(4, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasStreamID() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearStreamID() => clearField(5);
+}
+
+class PatchBookmarkRequest extends $pb.GeneratedMessage {
+  factory PatchBookmarkRequest({
+    $core.String? description,
+    $core.int? hours,
+    $core.int? minutes,
+    $core.int? seconds,
+    $core.int? bookmarkID,
+  }) {
+    final $result = create();
+    if (description != null) {
+      $result.description = description;
+    }
+    if (hours != null) {
+      $result.hours = hours;
+    }
+    if (minutes != null) {
+      $result.minutes = minutes;
+    }
+    if (seconds != null) {
+      $result.seconds = seconds;
+    }
+    if (bookmarkID != null) {
+      $result.bookmarkID = bookmarkID;
+    }
+    return $result;
+  }
+  PatchBookmarkRequest._() : super();
+
+  factory PatchBookmarkRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PatchBookmarkRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PatchBookmarkRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'description')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'hours', $pb.PbFieldType.OU3)
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'minutes', $pb.PbFieldType.OU3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'seconds', $pb.PbFieldType.OU3)..a<
+        $core.int>(5, _omitFieldNames ? '' : 'bookmarkID', $pb.PbFieldType.OU3,
+      protoName: 'bookmarkID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PatchBookmarkRequest clone() =>
+      PatchBookmarkRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PatchBookmarkRequest copyWith(void Function(PatchBookmarkRequest) updates) =>
+      super.copyWith((message) => updates(message as PatchBookmarkRequest))
+          as PatchBookmarkRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PatchBookmarkRequest create() => PatchBookmarkRequest._();
+  PatchBookmarkRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PatchBookmarkRequest> createRepeated() =>
+      $pb.PbList<PatchBookmarkRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PatchBookmarkRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PatchBookmarkRequest>(create);
+  static PatchBookmarkRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get description => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set description($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasDescription() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearDescription() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get hours => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set hours($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasHours() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearHours() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get minutes => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set minutes($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasMinutes() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearMinutes() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get seconds => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set seconds($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasSeconds() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSeconds() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.int get bookmarkID => $_getIZ(4);
+  @$pb.TagNumber(5)
+  set bookmarkID($core.int v) {
+    $_setUnsignedInt32(4, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasBookmarkID() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearBookmarkID() => clearField(5);
+}
+
+class DeleteBookmarkRequest extends $pb.GeneratedMessage {
+  factory DeleteBookmarkRequest({
+    $core.int? bookmarkID,
+  }) {
+    final $result = create();
+    if (bookmarkID != null) {
+      $result.bookmarkID = bookmarkID;
+    }
+    return $result;
+  }
+  DeleteBookmarkRequest._() : super();
+
+  factory DeleteBookmarkRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeleteBookmarkRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeleteBookmarkRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'bookmarkID', $pb.PbFieldType.OU3,
+      protoName: 'bookmarkID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeleteBookmarkRequest clone() =>
+      DeleteBookmarkRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeleteBookmarkRequest copyWith(
+    void Function(DeleteBookmarkRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as DeleteBookmarkRequest))
+          as DeleteBookmarkRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeleteBookmarkRequest create() => DeleteBookmarkRequest._();
+  DeleteBookmarkRequest createEmptyInstance() => create();
+
+  static $pb.PbList<DeleteBookmarkRequest> createRepeated() =>
+      $pb.PbList<DeleteBookmarkRequest>();
+  @$core.pragma('dart2js:noInline')
+  static DeleteBookmarkRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeleteBookmarkRequest>(create);
+  static DeleteBookmarkRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get bookmarkID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set bookmarkID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasBookmarkID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearBookmarkID() => clearField(1);
+}
+
+class GetBookmarksResponse extends $pb.GeneratedMessage {
+  factory GetBookmarksResponse({
+    $core.Iterable<Bookmark>? bookmarks,
+  }) {
+    final $result = create();
+    if (bookmarks != null) {
+      $result.bookmarks.addAll(bookmarks);
+    }
+    return $result;
+  }
+  GetBookmarksResponse._() : super();
+
+  factory GetBookmarksResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetBookmarksResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetBookmarksResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Bookmark>(1, _omitFieldNames ? '' : 'bookmarks', $pb.PbFieldType.PM,
+      subBuilder: Bookmark.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetBookmarksResponse clone() =>
+      GetBookmarksResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetBookmarksResponse copyWith(void Function(GetBookmarksResponse) updates) =>
+      super.copyWith((message) => updates(message as GetBookmarksResponse))
+          as GetBookmarksResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetBookmarksResponse create() => GetBookmarksResponse._();
+  GetBookmarksResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetBookmarksResponse> createRepeated() =>
+      $pb.PbList<GetBookmarksResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetBookmarksResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetBookmarksResponse>(create);
+  static GetBookmarksResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Bookmark> get bookmarks => $_getList(0);
+}
+
+class PutBookmarkResponse extends $pb.GeneratedMessage {
+  factory PutBookmarkResponse({
+    Bookmark? bookmark,
+  }) {
+    final $result = create();
+    if (bookmark != null) {
+      $result.bookmark = bookmark;
+    }
+    return $result;
+  }
+  PutBookmarkResponse._() : super();
+
+  factory PutBookmarkResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PutBookmarkResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PutBookmarkResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Bookmark>(1, _omitFieldNames ? '' : 'bookmark',
+      subBuilder: Bookmark.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PutBookmarkResponse clone() => PutBookmarkResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PutBookmarkResponse copyWith(void Function(PutBookmarkResponse) updates) =>
+      super.copyWith((message) => updates(message as PutBookmarkResponse))
+          as PutBookmarkResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PutBookmarkResponse create() => PutBookmarkResponse._();
+  PutBookmarkResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PutBookmarkResponse> createRepeated() =>
+      $pb.PbList<PutBookmarkResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PutBookmarkResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PutBookmarkResponse>(create);
+  static PutBookmarkResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Bookmark get bookmark => $_getN(0);
+  @$pb.TagNumber(1)
+  set bookmark(Bookmark v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasBookmark() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearBookmark() => clearField(1);
+  @$pb.TagNumber(1)
+  Bookmark ensureBookmark() => $_ensure(0);
+}
+
+class PatchBookmarkResponse extends $pb.GeneratedMessage {
+  factory PatchBookmarkResponse({
+    Bookmark? bookmark,
+  }) {
+    final $result = create();
+    if (bookmark != null) {
+      $result.bookmark = bookmark;
+    }
+    return $result;
+  }
+  PatchBookmarkResponse._() : super();
+
+  factory PatchBookmarkResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PatchBookmarkResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PatchBookmarkResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Bookmark>(1, _omitFieldNames ? '' : 'bookmark',
+      subBuilder: Bookmark.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PatchBookmarkResponse clone() =>
+      PatchBookmarkResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PatchBookmarkResponse copyWith(
+    void Function(PatchBookmarkResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PatchBookmarkResponse))
+          as PatchBookmarkResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PatchBookmarkResponse create() => PatchBookmarkResponse._();
+  PatchBookmarkResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PatchBookmarkResponse> createRepeated() =>
+      $pb.PbList<PatchBookmarkResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PatchBookmarkResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PatchBookmarkResponse>(create);
+  static PatchBookmarkResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Bookmark get bookmark => $_getN(0);
+  @$pb.TagNumber(1)
+  set bookmark(Bookmark v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasBookmark() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearBookmark() => clearField(1);
+  @$pb.TagNumber(1)
+  Bookmark ensureBookmark() => $_ensure(0);
+}
+
+class DeleteBookmarkResponse extends $pb.GeneratedMessage {
+  factory DeleteBookmarkResponse() => create();
+  DeleteBookmarkResponse._() : super();
+
+  factory DeleteBookmarkResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeleteBookmarkResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeleteBookmarkResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeleteBookmarkResponse clone() =>
+      DeleteBookmarkResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeleteBookmarkResponse copyWith(
+    void Function(DeleteBookmarkResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as DeleteBookmarkResponse))
+          as DeleteBookmarkResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeleteBookmarkResponse create() => DeleteBookmarkResponse._();
+  DeleteBookmarkResponse createEmptyInstance() => create();
+
+  static $pb.PbList<DeleteBookmarkResponse> createRepeated() =>
+      $pb.PbList<DeleteBookmarkResponse>();
+  @$core.pragma('dart2js:noInline')
+  static DeleteBookmarkResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeleteBookmarkResponse>(create);
+  static DeleteBookmarkResponse? _defaultInstance;
+}
+
+class BannerAlert extends $pb.GeneratedMessage {
+  factory BannerAlert({
+    $core.int? id,
+    $core.String? startsAt,
+    $core.String? expiresAt,
+    $core.String? text,
+    $core.bool? warn,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (startsAt != null) {
+      $result.startsAt = startsAt;
+    }
+    if (expiresAt != null) {
+      $result.expiresAt = expiresAt;
+    }
+    if (text != null) {
+      $result.text = text;
+    }
+    if (warn != null) {
+      $result.warn = warn;
+    }
+    return $result;
+  }
+  BannerAlert._() : super();
+
+  factory BannerAlert.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory BannerAlert.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'BannerAlert',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'startsAt', protoName: 'startsAt')
+    ..aOS(3, _omitFieldNames ? '' : 'expiresAt', protoName: 'expiresAt')
+    ..aOS(4, _omitFieldNames ? '' : 'text')
+    ..aOB(5, _omitFieldNames ? '' : 'warn')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  BannerAlert clone() => BannerAlert()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  BannerAlert copyWith(void Function(BannerAlert) updates) =>
+      super.copyWith((message) => updates(message as BannerAlert))
+          as BannerAlert;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static BannerAlert create() => BannerAlert._();
+  BannerAlert createEmptyInstance() => create();
+  static $pb.PbList<BannerAlert> createRepeated() => $pb.PbList<BannerAlert>();
+  @$core.pragma('dart2js:noInline')
+  static BannerAlert getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<BannerAlert>(create);
+  static BannerAlert? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get startsAt => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set startsAt($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasStartsAt() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearStartsAt() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get expiresAt => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set expiresAt($core.String v) {
+    $_setString(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasExpiresAt() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearExpiresAt() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get text => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set text($core.String v) {
+    $_setString(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasText() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearText() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.bool get warn => $_getBF(4);
+  @$pb.TagNumber(5)
+  set warn($core.bool v) {
+    $_setBool(4, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasWarn() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearWarn() => clearField(5);
+}
+
+class FeatureNotification extends $pb.GeneratedMessage {
+  factory FeatureNotification({
+    $core.int? id,
+    $core.String? title,
+    $core.String? body,
+    $core.int? target,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (title != null) {
+      $result.title = title;
+    }
+    if (body != null) {
+      $result.body = body;
+    }
+    if (target != null) {
+      $result.target = target;
+    }
+    return $result;
+  }
+  FeatureNotification._() : super();
+
+  factory FeatureNotification.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory FeatureNotification.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'FeatureNotification',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'Title', protoName: 'Title')
+    ..aOS(3, _omitFieldNames ? '' : 'Body', protoName: 'Body')
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'Target', $pb.PbFieldType.OU3,
+      protoName: 'Target',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  FeatureNotification clone() => FeatureNotification()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  FeatureNotification copyWith(void Function(FeatureNotification) updates) =>
+      super.copyWith((message) => updates(message as FeatureNotification))
+          as FeatureNotification;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static FeatureNotification create() => FeatureNotification._();
+  FeatureNotification createEmptyInstance() => create();
+
+  static $pb.PbList<FeatureNotification> createRepeated() =>
+      $pb.PbList<FeatureNotification>();
+  @$core.pragma('dart2js:noInline')
+  static FeatureNotification getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<FeatureNotification>(create);
+  static FeatureNotification? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get title => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set title($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasTitle() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearTitle() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get body => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set body($core.String v) {
+    $_setString(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasBody() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearBody() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get target => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set target($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasTarget() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearTarget() => clearField(4);
+}
+
+class PostDeviceTokenRequest extends $pb.GeneratedMessage {
+  factory PostDeviceTokenRequest({
+    $core.String? deviceToken,
+  }) {
+    final $result = create();
+    if (deviceToken != null) {
+      $result.deviceToken = deviceToken;
+    }
+    return $result;
+  }
+  PostDeviceTokenRequest._() : super();
+
+  factory PostDeviceTokenRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostDeviceTokenRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostDeviceTokenRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'deviceToken', protoName: 'deviceToken')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostDeviceTokenRequest clone() =>
+      PostDeviceTokenRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostDeviceTokenRequest copyWith(
+    void Function(PostDeviceTokenRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostDeviceTokenRequest))
+          as PostDeviceTokenRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PostDeviceTokenRequest create() => PostDeviceTokenRequest._();
+  PostDeviceTokenRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PostDeviceTokenRequest> createRepeated() =>
+      $pb.PbList<PostDeviceTokenRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PostDeviceTokenRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostDeviceTokenRequest>(create);
+  static PostDeviceTokenRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get deviceToken => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set deviceToken($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasDeviceToken() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearDeviceToken() => clearField(1);
+}
+
+class DeleteDeviceTokenRequest extends $pb.GeneratedMessage {
+  factory DeleteDeviceTokenRequest({
+    $core.String? deviceToken,
+  }) {
+    final $result = create();
+    if (deviceToken != null) {
+      $result.deviceToken = deviceToken;
+    }
+    return $result;
+  }
+  DeleteDeviceTokenRequest._() : super();
+
+  factory DeleteDeviceTokenRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeleteDeviceTokenRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeleteDeviceTokenRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'deviceToken', protoName: 'deviceToken')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeleteDeviceTokenRequest clone() =>
+      DeleteDeviceTokenRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeleteDeviceTokenRequest copyWith(
+    void Function(DeleteDeviceTokenRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as DeleteDeviceTokenRequest))
+          as DeleteDeviceTokenRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeleteDeviceTokenRequest create() => DeleteDeviceTokenRequest._();
+  DeleteDeviceTokenRequest createEmptyInstance() => create();
+
+  static $pb.PbList<DeleteDeviceTokenRequest> createRepeated() =>
+      $pb.PbList<DeleteDeviceTokenRequest>();
+  @$core.pragma('dart2js:noInline')
+  static DeleteDeviceTokenRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeleteDeviceTokenRequest>(create);
+  static DeleteDeviceTokenRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get deviceToken => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set deviceToken($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasDeviceToken() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearDeviceToken() => clearField(1);
+}
+
+class GetBannerAlertsRequest extends $pb.GeneratedMessage {
+  factory GetBannerAlertsRequest() => create();
+  GetBannerAlertsRequest._() : super();
+
+  factory GetBannerAlertsRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetBannerAlertsRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetBannerAlertsRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetBannerAlertsRequest clone() =>
+      GetBannerAlertsRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetBannerAlertsRequest copyWith(
+    void Function(GetBannerAlertsRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetBannerAlertsRequest))
+          as GetBannerAlertsRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetBannerAlertsRequest create() => GetBannerAlertsRequest._();
+  GetBannerAlertsRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetBannerAlertsRequest> createRepeated() =>
+      $pb.PbList<GetBannerAlertsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetBannerAlertsRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetBannerAlertsRequest>(create);
+  static GetBannerAlertsRequest? _defaultInstance;
+}
+
+class GetFeatureNotificationsRequest extends $pb.GeneratedMessage {
+  factory GetFeatureNotificationsRequest() => create();
+  GetFeatureNotificationsRequest._() : super();
+
+  factory GetFeatureNotificationsRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetFeatureNotificationsRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetFeatureNotificationsRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetFeatureNotificationsRequest clone() =>
+      GetFeatureNotificationsRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetFeatureNotificationsRequest copyWith(
+    void Function(GetFeatureNotificationsRequest) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as GetFeatureNotificationsRequest),
+      ) as GetFeatureNotificationsRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetFeatureNotificationsRequest create() =>
+      GetFeatureNotificationsRequest._();
+  GetFeatureNotificationsRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetFeatureNotificationsRequest> createRepeated() =>
+      $pb.PbList<GetFeatureNotificationsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetFeatureNotificationsRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetFeatureNotificationsRequest>(create);
+  static GetFeatureNotificationsRequest? _defaultInstance;
+}
+
+class PostDeviceTokenResponse extends $pb.GeneratedMessage {
+  factory PostDeviceTokenResponse() => create();
+  PostDeviceTokenResponse._() : super();
+
+  factory PostDeviceTokenResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PostDeviceTokenResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PostDeviceTokenResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PostDeviceTokenResponse clone() =>
+      PostDeviceTokenResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PostDeviceTokenResponse copyWith(
+    void Function(PostDeviceTokenResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as PostDeviceTokenResponse))
+          as PostDeviceTokenResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PostDeviceTokenResponse create() => PostDeviceTokenResponse._();
+  PostDeviceTokenResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PostDeviceTokenResponse> createRepeated() =>
+      $pb.PbList<PostDeviceTokenResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PostDeviceTokenResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PostDeviceTokenResponse>(create);
+  static PostDeviceTokenResponse? _defaultInstance;
+}
+
+class DeleteDeviceTokenResponse extends $pb.GeneratedMessage {
+  factory DeleteDeviceTokenResponse() => create();
+  DeleteDeviceTokenResponse._() : super();
+
+  factory DeleteDeviceTokenResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory DeleteDeviceTokenResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'DeleteDeviceTokenResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  DeleteDeviceTokenResponse clone() =>
+      DeleteDeviceTokenResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  DeleteDeviceTokenResponse copyWith(
+    void Function(DeleteDeviceTokenResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as DeleteDeviceTokenResponse))
+          as DeleteDeviceTokenResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static DeleteDeviceTokenResponse create() => DeleteDeviceTokenResponse._();
+  DeleteDeviceTokenResponse createEmptyInstance() => create();
+
+  static $pb.PbList<DeleteDeviceTokenResponse> createRepeated() =>
+      $pb.PbList<DeleteDeviceTokenResponse>();
+  @$core.pragma('dart2js:noInline')
+  static DeleteDeviceTokenResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<DeleteDeviceTokenResponse>(create);
+  static DeleteDeviceTokenResponse? _defaultInstance;
+}
+
+class GetBannerAlertsResponse extends $pb.GeneratedMessage {
+  factory GetBannerAlertsResponse({
+    $core.Iterable<BannerAlert>? bannerAlerts,
+  }) {
+    final $result = create();
+    if (bannerAlerts != null) {
+      $result.bannerAlerts.addAll(bannerAlerts);
+    }
+    return $result;
+  }
+  GetBannerAlertsResponse._() : super();
+
+  factory GetBannerAlertsResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetBannerAlertsResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetBannerAlertsResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<BannerAlert>(
+        1, _omitFieldNames ? '' : 'bannerAlerts', $pb.PbFieldType.PM,
+      protoName: 'bannerAlerts',
+      subBuilder: BannerAlert.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetBannerAlertsResponse clone() =>
+      GetBannerAlertsResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetBannerAlertsResponse copyWith(
+    void Function(GetBannerAlertsResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetBannerAlertsResponse))
+          as GetBannerAlertsResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetBannerAlertsResponse create() => GetBannerAlertsResponse._();
+  GetBannerAlertsResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetBannerAlertsResponse> createRepeated() =>
+      $pb.PbList<GetBannerAlertsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetBannerAlertsResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetBannerAlertsResponse>(create);
+  static GetBannerAlertsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<BannerAlert> get bannerAlerts => $_getList(0);
+}
+
+class GetFeatureNotificationsResponse extends $pb.GeneratedMessage {
+  factory GetFeatureNotificationsResponse({
+    $core.Iterable<FeatureNotification>? featureNotifications,
+  }) {
+    final $result = create();
+    if (featureNotifications != null) {
+      $result.featureNotifications.addAll(featureNotifications);
+    }
+    return $result;
+  }
+  GetFeatureNotificationsResponse._() : super();
+
+  factory GetFeatureNotificationsResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetFeatureNotificationsResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetFeatureNotificationsResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<FeatureNotification>(
+        1, _omitFieldNames ? '' : 'featureNotifications', $pb.PbFieldType.PM,
+        protoName: 'featureNotifications',
+      subBuilder: FeatureNotification.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetFeatureNotificationsResponse clone() =>
+      GetFeatureNotificationsResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetFeatureNotificationsResponse copyWith(
+    void Function(GetFeatureNotificationsResponse) updates,
+  ) =>
+      super.copyWith(
+        (message) => updates(message as GetFeatureNotificationsResponse),
+      ) as GetFeatureNotificationsResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetFeatureNotificationsResponse create() =>
+      GetFeatureNotificationsResponse._();
+  GetFeatureNotificationsResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetFeatureNotificationsResponse> createRepeated() =>
+      $pb.PbList<GetFeatureNotificationsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetFeatureNotificationsResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetFeatureNotificationsResponse>(
+        create,
+      );
+  static GetFeatureNotificationsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<FeatureNotification> get featureNotifications => $_getList(0);
+}
+
+class Course extends $pb.GeneratedMessage {
+  factory Course({
+    $core.int? id,
+    $core.String? name,
+    $core.String? slug,
+    Semester? semester,
+    $core.String? tUMOnlineIdentifier,
+    $core.bool? vODEnabled,
+    $core.bool? downloadsEnabled,
+    $core.bool? chatEnabled,
+    $core.bool? anonymousChatEnabled,
+    $core.bool? moderatedChatEnabled,
+    $core.bool? vodChatEnabled,
+    $core.Iterable<Stream>? streams,
+    $core.String? cameraPresetPreferences,
+    $core.String? sourcePreferences,
+    $core.int? lastRecordingID,
+    $core.int? nextLectureID,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (slug != null) {
+      $result.slug = slug;
+    }
+    if (semester != null) {
+      $result.semester = semester;
+    }
+    if (tUMOnlineIdentifier != null) {
+      $result.tUMOnlineIdentifier = tUMOnlineIdentifier;
+    }
+    if (vODEnabled != null) {
+      $result.vODEnabled = vODEnabled;
+    }
+    if (downloadsEnabled != null) {
+      $result.downloadsEnabled = downloadsEnabled;
+    }
+    if (chatEnabled != null) {
+      $result.chatEnabled = chatEnabled;
+    }
+    if (anonymousChatEnabled != null) {
+      $result.anonymousChatEnabled = anonymousChatEnabled;
+    }
+    if (moderatedChatEnabled != null) {
+      $result.moderatedChatEnabled = moderatedChatEnabled;
+    }
+    if (vodChatEnabled != null) {
+      $result.vodChatEnabled = vodChatEnabled;
+    }
+    if (streams != null) {
+      $result.streams.addAll(streams);
+    }
+    if (cameraPresetPreferences != null) {
+      $result.cameraPresetPreferences = cameraPresetPreferences;
+    }
+    if (sourcePreferences != null) {
+      $result.sourcePreferences = sourcePreferences;
+    }
+    if (lastRecordingID != null) {
+      $result.lastRecordingID = lastRecordingID;
+    }
+    if (nextLectureID != null) {
+      $result.nextLectureID = nextLectureID;
+    }
+    return $result;
+  }
+  Course._() : super();
+
+  factory Course.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Course.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Course',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..aOS(3, _omitFieldNames ? '' : 'slug')
+    ..aOM<Semester>(4, _omitFieldNames ? '' : 'semester',
+      subBuilder: Semester.create,
+    )
+    ..aOS(5, _omitFieldNames ? '' : 'TUMOnlineIdentifier',
+      protoName: 'TUMOnlineIdentifier',
+    )
+    ..aOB(6, _omitFieldNames ? '' : 'VODEnabled', protoName: 'VODEnabled')..aOB(
+        7, _omitFieldNames ? '' : 'downloadsEnabled',
+      protoName: 'downloadsEnabled',
+    )
+    ..aOB(8, _omitFieldNames ? '' : 'chatEnabled', protoName: 'chatEnabled')..aOB(
+        9, _omitFieldNames ? '' : 'anonymousChatEnabled',
+      protoName: 'anonymousChatEnabled',
+    )
+    ..aOB(
+      10,
+      _omitFieldNames ? '' : 'moderatedChatEnabled',
+      protoName: 'moderatedChatEnabled',
+    )
+    ..aOB(
+      11,
+      _omitFieldNames ? '' : 'vodChatEnabled',
+      protoName: 'vodChatEnabled',
+    )
+    ..pc<Stream>(12, _omitFieldNames ? '' : 'streams', $pb.PbFieldType.PM,
+      subBuilder: Stream.create,
+    )
+    ..aOS(13, _omitFieldNames ? '' : 'cameraPresetPreferences',
+      protoName: 'cameraPresetPreferences',
+    )
+    ..aOS(
+      14,
+      _omitFieldNames ? '' : 'sourcePreferences',
+      protoName: 'sourcePreferences',
+    )
+    ..a<$core.int>(
+        15, _omitFieldNames ? '' : 'lastRecordingID', $pb.PbFieldType.OU3,
+      protoName: 'lastRecordingID',
+    )
+    ..a<$core.int>(
+      16,
+      _omitFieldNames ? '' : 'nextLectureID',
+      $pb.PbFieldType.OU3,
+      protoName: 'nextLectureID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Course clone() => Course()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Course copyWith(void Function(Course) updates) =>
+      super.copyWith((message) => updates(message as Course)) as Course;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Course create() => Course._();
+  Course createEmptyInstance() => create();
+  static $pb.PbList<Course> createRepeated() => $pb.PbList<Course>();
+  @$core.pragma('dart2js:noInline')
+  static Course getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Course>(create);
+  static Course? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get name => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set name($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearName() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get slug => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set slug($core.String v) {
+    $_setString(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasSlug() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearSlug() => clearField(3);
+
+  @$pb.TagNumber(4)
+  Semester get semester => $_getN(3);
+  @$pb.TagNumber(4)
+  set semester(Semester v) {
+    setField(4, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasSemester() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSemester() => clearField(4);
+  @$pb.TagNumber(4)
+  Semester ensureSemester() => $_ensure(3);
+
+  @$pb.TagNumber(5)
+  $core.String get tUMOnlineIdentifier => $_getSZ(4);
+  @$pb.TagNumber(5)
+  set tUMOnlineIdentifier($core.String v) {
+    $_setString(4, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasTUMOnlineIdentifier() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearTUMOnlineIdentifier() => clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.bool get vODEnabled => $_getBF(5);
+  @$pb.TagNumber(6)
+  set vODEnabled($core.bool v) {
+    $_setBool(5, v);
+  }
+
+  @$pb.TagNumber(6)
+  $core.bool hasVODEnabled() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearVODEnabled() => clearField(6);
+
+  @$pb.TagNumber(7)
+  $core.bool get downloadsEnabled => $_getBF(6);
+  @$pb.TagNumber(7)
+  set downloadsEnabled($core.bool v) {
+    $_setBool(6, v);
+  }
+
+  @$pb.TagNumber(7)
+  $core.bool hasDownloadsEnabled() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearDownloadsEnabled() => clearField(7);
+
+  @$pb.TagNumber(8)
+  $core.bool get chatEnabled => $_getBF(7);
+  @$pb.TagNumber(8)
+  set chatEnabled($core.bool v) {
+    $_setBool(7, v);
+  }
+
+  @$pb.TagNumber(8)
+  $core.bool hasChatEnabled() => $_has(7);
+  @$pb.TagNumber(8)
+  void clearChatEnabled() => clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.bool get anonymousChatEnabled => $_getBF(8);
+  @$pb.TagNumber(9)
+  set anonymousChatEnabled($core.bool v) {
+    $_setBool(8, v);
+  }
+
+  @$pb.TagNumber(9)
+  $core.bool hasAnonymousChatEnabled() => $_has(8);
+  @$pb.TagNumber(9)
+  void clearAnonymousChatEnabled() => clearField(9);
+
+  @$pb.TagNumber(10)
+  $core.bool get moderatedChatEnabled => $_getBF(9);
+  @$pb.TagNumber(10)
+  set moderatedChatEnabled($core.bool v) {
+    $_setBool(9, v);
+  }
+
+  @$pb.TagNumber(10)
+  $core.bool hasModeratedChatEnabled() => $_has(9);
+  @$pb.TagNumber(10)
+  void clearModeratedChatEnabled() => clearField(10);
+
+  @$pb.TagNumber(11)
+  $core.bool get vodChatEnabled => $_getBF(10);
+  @$pb.TagNumber(11)
+  set vodChatEnabled($core.bool v) {
+    $_setBool(10, v);
+  }
+
+  @$pb.TagNumber(11)
+  $core.bool hasVodChatEnabled() => $_has(10);
+  @$pb.TagNumber(11)
+  void clearVodChatEnabled() => clearField(11);
+
+  @$pb.TagNumber(12)
+  $core.List<Stream> get streams => $_getList(11);
+
+  @$pb.TagNumber(13)
+  $core.String get cameraPresetPreferences => $_getSZ(12);
+  @$pb.TagNumber(13)
+  set cameraPresetPreferences($core.String v) {
+    $_setString(12, v);
+  }
+
+  @$pb.TagNumber(13)
+  $core.bool hasCameraPresetPreferences() => $_has(12);
+  @$pb.TagNumber(13)
+  void clearCameraPresetPreferences() => clearField(13);
+
+  @$pb.TagNumber(14)
+  $core.String get sourcePreferences => $_getSZ(13);
+  @$pb.TagNumber(14)
+  set sourcePreferences($core.String v) {
+    $_setString(13, v);
+  }
+
+  @$pb.TagNumber(14)
+  $core.bool hasSourcePreferences() => $_has(13);
+  @$pb.TagNumber(14)
+  void clearSourcePreferences() => clearField(14);
+
+  @$pb.TagNumber(15)
+  $core.int get lastRecordingID => $_getIZ(14);
+  @$pb.TagNumber(15)
+  set lastRecordingID($core.int v) {
+    $_setUnsignedInt32(14, v);
+  }
+
+  @$pb.TagNumber(15)
+  $core.bool hasLastRecordingID() => $_has(14);
+  @$pb.TagNumber(15)
+  void clearLastRecordingID() => clearField(15);
+
+  @$pb.TagNumber(16)
+  $core.int get nextLectureID => $_getIZ(15);
+  @$pb.TagNumber(16)
+  set nextLectureID($core.int v) {
+    $_setUnsignedInt32(15, v);
+  }
+
+  @$pb.TagNumber(16)
+  $core.bool hasNextLectureID() => $_has(15);
+  @$pb.TagNumber(16)
+  void clearNextLectureID() => clearField(16);
+}
+
+class Semester extends $pb.GeneratedMessage {
+  factory Semester({
+    $core.String? teachingTerm,
+    $core.int? year,
+  }) {
+    final $result = create();
+    if (teachingTerm != null) {
+      $result.teachingTerm = teachingTerm;
+    }
+    if (year != null) {
+      $result.year = year;
+    }
+    return $result;
+  }
+  Semester._() : super();
+
+  factory Semester.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Semester.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Semester',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'teachingTerm', protoName: 'teachingTerm')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'year', $pb.PbFieldType.OU3)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Semester clone() => Semester()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Semester copyWith(void Function(Semester) updates) =>
+      super.copyWith((message) => updates(message as Semester)) as Semester;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Semester create() => Semester._();
+  Semester createEmptyInstance() => create();
+  static $pb.PbList<Semester> createRepeated() => $pb.PbList<Semester>();
+  @$core.pragma('dart2js:noInline')
+  static Semester getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Semester>(create);
+  static Semester? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get teachingTerm => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set teachingTerm($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasTeachingTerm() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearTeachingTerm() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get year => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set year($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasYear() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearYear() => clearField(2);
+}
+
+class GetPublicCoursesRequest extends $pb.GeneratedMessage {
+  factory GetPublicCoursesRequest({
+    $core.int? year,
+    $core.String? term,
+    $core.int? limit,
+    $core.int? skip,
+  }) {
+    final $result = create();
+    if (year != null) {
+      $result.year = year;
+    }
+    if (term != null) {
+      $result.term = term;
+    }
+    if (limit != null) {
+      $result.limit = limit;
+    }
+    if (skip != null) {
+      $result.skip = skip;
+    }
+    return $result;
+  }
+  GetPublicCoursesRequest._() : super();
+
+  factory GetPublicCoursesRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetPublicCoursesRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetPublicCoursesRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'year', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'term')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'limit', $pb.PbFieldType.OU3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'skip', $pb.PbFieldType.OU3)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetPublicCoursesRequest clone() =>
+      GetPublicCoursesRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetPublicCoursesRequest copyWith(
+    void Function(GetPublicCoursesRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetPublicCoursesRequest))
+          as GetPublicCoursesRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetPublicCoursesRequest create() => GetPublicCoursesRequest._();
+  GetPublicCoursesRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetPublicCoursesRequest> createRepeated() =>
+      $pb.PbList<GetPublicCoursesRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetPublicCoursesRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetPublicCoursesRequest>(create);
+  static GetPublicCoursesRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get year => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set year($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasYear() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearYear() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get term => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set term($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasTerm() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearTerm() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get limit => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set limit($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasLimit() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearLimit() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get skip => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set skip($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasSkip() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSkip() => clearField(4);
+}
+
+class GetSemestersRequest extends $pb.GeneratedMessage {
+  factory GetSemestersRequest() => create();
+  GetSemestersRequest._() : super();
+
+  factory GetSemestersRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetSemestersRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetSemestersRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetSemestersRequest clone() => GetSemestersRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetSemestersRequest copyWith(void Function(GetSemestersRequest) updates) =>
+      super.copyWith((message) => updates(message as GetSemestersRequest))
+          as GetSemestersRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetSemestersRequest create() => GetSemestersRequest._();
+  GetSemestersRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetSemestersRequest> createRepeated() =>
+      $pb.PbList<GetSemestersRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetSemestersRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetSemestersRequest>(create);
+  static GetSemestersRequest? _defaultInstance;
+}
+
+class GetCourseStreamsRequest extends $pb.GeneratedMessage {
+  factory GetCourseStreamsRequest({
+    $core.int? courseID,
+  }) {
+    final $result = create();
+    if (courseID != null) {
+      $result.courseID = courseID;
+    }
+    return $result;
+  }
+  GetCourseStreamsRequest._() : super();
+
+  factory GetCourseStreamsRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetCourseStreamsRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetCourseStreamsRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'courseID', $pb.PbFieldType.OU3,
+      protoName: 'courseID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetCourseStreamsRequest clone() =>
+      GetCourseStreamsRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetCourseStreamsRequest copyWith(
+    void Function(GetCourseStreamsRequest) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetCourseStreamsRequest))
+          as GetCourseStreamsRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetCourseStreamsRequest create() => GetCourseStreamsRequest._();
+  GetCourseStreamsRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetCourseStreamsRequest> createRepeated() =>
+      $pb.PbList<GetCourseStreamsRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetCourseStreamsRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetCourseStreamsRequest>(create);
+  static GetCourseStreamsRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get courseID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set courseID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasCourseID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCourseID() => clearField(1);
+}
+
+class GetPublicCoursesResponse extends $pb.GeneratedMessage {
+  factory GetPublicCoursesResponse({
+    $core.Iterable<Course>? courses,
+  }) {
+    final $result = create();
+    if (courses != null) {
+      $result.courses.addAll(courses);
+    }
+    return $result;
+  }
+  GetPublicCoursesResponse._() : super();
+
+  factory GetPublicCoursesResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetPublicCoursesResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetPublicCoursesResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Course>(1, _omitFieldNames ? '' : 'courses', $pb.PbFieldType.PM,
+      subBuilder: Course.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetPublicCoursesResponse clone() =>
+      GetPublicCoursesResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetPublicCoursesResponse copyWith(
+    void Function(GetPublicCoursesResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetPublicCoursesResponse))
+          as GetPublicCoursesResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetPublicCoursesResponse create() => GetPublicCoursesResponse._();
+  GetPublicCoursesResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetPublicCoursesResponse> createRepeated() =>
+      $pb.PbList<GetPublicCoursesResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetPublicCoursesResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetPublicCoursesResponse>(create);
+  static GetPublicCoursesResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Course> get courses => $_getList(0);
+}
+
+class GetSemestersResponse extends $pb.GeneratedMessage {
+  factory GetSemestersResponse({
+    Semester? current,
+    $core.Iterable<Semester>? semesters,
+  }) {
+    final $result = create();
+    if (current != null) {
+      $result.current = current;
+    }
+    if (semesters != null) {
+      $result.semesters.addAll(semesters);
+    }
+    return $result;
+  }
+  GetSemestersResponse._() : super();
+
+  factory GetSemestersResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetSemestersResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetSemestersResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Semester>(1, _omitFieldNames ? '' : 'current',
+      subBuilder: Semester.create,
+    )
+    ..pc<Semester>(2, _omitFieldNames ? '' : 'semesters', $pb.PbFieldType.PM,
+      subBuilder: Semester.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetSemestersResponse clone() =>
+      GetSemestersResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetSemestersResponse copyWith(void Function(GetSemestersResponse) updates) =>
+      super.copyWith((message) => updates(message as GetSemestersResponse))
+          as GetSemestersResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetSemestersResponse create() => GetSemestersResponse._();
+  GetSemestersResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetSemestersResponse> createRepeated() =>
+      $pb.PbList<GetSemestersResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetSemestersResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetSemestersResponse>(create);
+  static GetSemestersResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Semester get current => $_getN(0);
+  @$pb.TagNumber(1)
+  set current(Semester v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasCurrent() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCurrent() => clearField(1);
+  @$pb.TagNumber(1)
+  Semester ensureCurrent() => $_ensure(0);
+
+  @$pb.TagNumber(2)
+  $core.List<Semester> get semesters => $_getList(1);
+}
+
+class GetCourseStreamsResponse extends $pb.GeneratedMessage {
+  factory GetCourseStreamsResponse({
+    $core.Iterable<Stream>? streams,
+  }) {
+    final $result = create();
+    if (streams != null) {
+      $result.streams.addAll(streams);
+    }
+    return $result;
+  }
+  GetCourseStreamsResponse._() : super();
+
+  factory GetCourseStreamsResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetCourseStreamsResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetCourseStreamsResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Stream>(1, _omitFieldNames ? '' : 'streams', $pb.PbFieldType.PM,
+      subBuilder: Stream.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetCourseStreamsResponse clone() =>
+      GetCourseStreamsResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetCourseStreamsResponse copyWith(
+    void Function(GetCourseStreamsResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetCourseStreamsResponse))
+          as GetCourseStreamsResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetCourseStreamsResponse create() => GetCourseStreamsResponse._();
+  GetCourseStreamsResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetCourseStreamsResponse> createRepeated() =>
+      $pb.PbList<GetCourseStreamsResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetCourseStreamsResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetCourseStreamsResponse>(create);
+  static GetCourseStreamsResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Stream> get streams => $_getList(0);
+}
+
+class Stream extends $pb.GeneratedMessage {
+  factory Stream({
+    $core.int? id,
+    $core.String? name,
+    $core.String? description,
+    $core.int? courseID,
+    $1.Timestamp? start,
+    $1.Timestamp? end,
+    $core.bool? chatEnabled,
+    $core.String? roomName,
+    $core.String? roomCode,
+    $core.String? eventTypeName,
+    $core.int? tUMOnlineEventID,
+    $core.String? seriesIdentifier,
+    $core.String? playlistUrl,
+    $core.String? playlistUrlPRES,
+    $core.String? playlistUrlCAM,
+    $core.bool? liveNow,
+    $1.Timestamp? liveNowTimestamp,
+    $core.bool? recording,
+    $core.bool? premiere,
+    $core.bool? ended,
+    $core.int? vodViews,
+    $core.int? startOffset,
+    $core.int? endOffset,
+    $core.int? duration,
+    $core.Iterable<Download>? downloads,
+    $core.bool? isPlanned,
+    $core.bool? isComingUp,
+    $core.String? hLSUrl,
+  }) {
+    final $result = create();
+    if (id != null) {
+      $result.id = id;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (description != null) {
+      $result.description = description;
+    }
+    if (courseID != null) {
+      $result.courseID = courseID;
+    }
+    if (start != null) {
+      $result.start = start;
+    }
+    if (end != null) {
+      $result.end = end;
+    }
+    if (chatEnabled != null) {
+      $result.chatEnabled = chatEnabled;
+    }
+    if (roomName != null) {
+      $result.roomName = roomName;
+    }
+    if (roomCode != null) {
+      $result.roomCode = roomCode;
+    }
+    if (eventTypeName != null) {
+      $result.eventTypeName = eventTypeName;
+    }
+    if (tUMOnlineEventID != null) {
+      $result.tUMOnlineEventID = tUMOnlineEventID;
+    }
+    if (seriesIdentifier != null) {
+      $result.seriesIdentifier = seriesIdentifier;
+    }
+    if (playlistUrl != null) {
+      $result.playlistUrl = playlistUrl;
+    }
+    if (playlistUrlPRES != null) {
+      $result.playlistUrlPRES = playlistUrlPRES;
+    }
+    if (playlistUrlCAM != null) {
+      $result.playlistUrlCAM = playlistUrlCAM;
+    }
+    if (liveNow != null) {
+      $result.liveNow = liveNow;
+    }
+    if (liveNowTimestamp != null) {
+      $result.liveNowTimestamp = liveNowTimestamp;
+    }
+    if (recording != null) {
+      $result.recording = recording;
+    }
+    if (premiere != null) {
+      $result.premiere = premiere;
+    }
+    if (ended != null) {
+      $result.ended = ended;
+    }
+    if (vodViews != null) {
+      $result.vodViews = vodViews;
+    }
+    if (startOffset != null) {
+      $result.startOffset = startOffset;
+    }
+    if (endOffset != null) {
+      $result.endOffset = endOffset;
+    }
+    if (duration != null) {
+      $result.duration = duration;
+    }
+    if (downloads != null) {
+      $result.downloads.addAll(downloads);
+    }
+    if (isPlanned != null) {
+      $result.isPlanned = isPlanned;
+    }
+    if (isComingUp != null) {
+      $result.isComingUp = isComingUp;
+    }
+    if (hLSUrl != null) {
+      $result.hLSUrl = hLSUrl;
+    }
+    return $result;
+  }
+  Stream._() : super();
+
+  factory Stream.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Stream.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Stream',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3)
+    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..aOS(3, _omitFieldNames ? '' : 'description')
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'courseID', $pb.PbFieldType.OU3,
+      protoName: 'courseID',
+    )
+    ..aOM<$1.Timestamp>(5, _omitFieldNames ? '' : 'start',
+      subBuilder: $1.Timestamp.create,
+    )
+    ..aOM<$1.Timestamp>(6, _omitFieldNames ? '' : 'end',
+      subBuilder: $1.Timestamp.create,
+    )
+    ..aOB(7, _omitFieldNames ? '' : 'chatEnabled', protoName: 'chatEnabled')
+    ..aOS(8, _omitFieldNames ? '' : 'roomName', protoName: 'roomName')
+    ..aOS(9, _omitFieldNames ? '' : 'roomCode', protoName: 'roomCode')..aOS(
+        10, _omitFieldNames ? '' : 'eventTypeName',
+      protoName: 'eventTypeName',
+    )
+    ..a<$core.int>(
+        11, _omitFieldNames ? '' : 'TUMOnlineEventID', $pb.PbFieldType.OU3,
+      protoName: 'TUMOnlineEventID',
+    )
+    ..aOS(12, _omitFieldNames ? '' : 'seriesIdentifier',
+      protoName: 'seriesIdentifier',
+    )
+    ..aOS(13, _omitFieldNames ? '' : 'playlistUrl', protoName: 'playlistUrl')..aOS(
+        14, _omitFieldNames ? '' : 'playlistUrlPRES',
+      protoName: 'playlistUrlPRES',
+    )
+    ..aOS(
+      15,
+      _omitFieldNames ? '' : 'playlistUrlCAM',
+      protoName: 'playlistUrlCAM',
+    )
+    ..aOB(16, _omitFieldNames ? '' : 'liveNow', protoName: 'liveNow')
+    ..aOM<$1.Timestamp>(17, _omitFieldNames ? '' : 'liveNowTimestamp',
+      protoName: 'liveNowTimestamp',
+      subBuilder: $1.Timestamp.create,
+    )
+    ..aOB(18, _omitFieldNames ? '' : 'recording')
+    ..aOB(19, _omitFieldNames ? '' : 'premiere')
+    ..aOB(20, _omitFieldNames ? '' : 'ended')
+    ..a<$core.int>(21, _omitFieldNames ? '' : 'vodViews', $pb.PbFieldType.OU3,
+      protoName: 'vodViews',
+    )
+    ..a<$core.int>(
+        22, _omitFieldNames ? '' : 'startOffset', $pb.PbFieldType.OU3,
+      protoName: 'startOffset',
+    )
+    ..a<$core.int>(23, _omitFieldNames ? '' : 'endOffset', $pb.PbFieldType.OU3,
+      protoName: 'endOffset',
+    )
+    ..a<$core.int>(28, _omitFieldNames ? '' : 'duration', $pb.PbFieldType.OU3)
+    ..pc<Download>(29, _omitFieldNames ? '' : 'downloads', $pb.PbFieldType.PM,
+      subBuilder: Download.create,
+    )
+    ..aOB(30, _omitFieldNames ? '' : 'isPlanned', protoName: 'isPlanned')
+    ..aOB(31, _omitFieldNames ? '' : 'isComingUp', protoName: 'isComingUp')
+    ..aOS(32, _omitFieldNames ? '' : 'HLSUrl', protoName: 'HLSUrl')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Stream clone() => Stream()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Stream copyWith(void Function(Stream) updates) =>
+      super.copyWith((message) => updates(message as Stream)) as Stream;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Stream create() => Stream._();
+  Stream createEmptyInstance() => create();
+  static $pb.PbList<Stream> createRepeated() => $pb.PbList<Stream>();
+  @$core.pragma('dart2js:noInline')
+  static Stream getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Stream>(create);
+  static Stream? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get id => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set id($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get name => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set name($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearName() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get description => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set description($core.String v) {
+    $_setString(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasDescription() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearDescription() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get courseID => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set courseID($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasCourseID() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearCourseID() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $1.Timestamp get start => $_getN(4);
+  @$pb.TagNumber(5)
+  set start($1.Timestamp v) {
+    setField(5, v);
+  }
+
+  @$pb.TagNumber(5)
+  $core.bool hasStart() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearStart() => clearField(5);
+  @$pb.TagNumber(5)
+  $1.Timestamp ensureStart() => $_ensure(4);
+
+  @$pb.TagNumber(6)
+  $1.Timestamp get end => $_getN(5);
+  @$pb.TagNumber(6)
+  set end($1.Timestamp v) {
+    setField(6, v);
+  }
+
+  @$pb.TagNumber(6)
+  $core.bool hasEnd() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearEnd() => clearField(6);
+  @$pb.TagNumber(6)
+  $1.Timestamp ensureEnd() => $_ensure(5);
+
+  @$pb.TagNumber(7)
+  $core.bool get chatEnabled => $_getBF(6);
+  @$pb.TagNumber(7)
+  set chatEnabled($core.bool v) {
+    $_setBool(6, v);
+  }
+
+  @$pb.TagNumber(7)
+  $core.bool hasChatEnabled() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearChatEnabled() => clearField(7);
+
+  @$pb.TagNumber(8)
+  $core.String get roomName => $_getSZ(7);
+  @$pb.TagNumber(8)
+  set roomName($core.String v) {
+    $_setString(7, v);
+  }
+
+  @$pb.TagNumber(8)
+  $core.bool hasRoomName() => $_has(7);
+  @$pb.TagNumber(8)
+  void clearRoomName() => clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get roomCode => $_getSZ(8);
+  @$pb.TagNumber(9)
+  set roomCode($core.String v) {
+    $_setString(8, v);
+  }
+
+  @$pb.TagNumber(9)
+  $core.bool hasRoomCode() => $_has(8);
+  @$pb.TagNumber(9)
+  void clearRoomCode() => clearField(9);
+
+  @$pb.TagNumber(10)
+  $core.String get eventTypeName => $_getSZ(9);
+  @$pb.TagNumber(10)
+  set eventTypeName($core.String v) {
+    $_setString(9, v);
+  }
+
+  @$pb.TagNumber(10)
+  $core.bool hasEventTypeName() => $_has(9);
+  @$pb.TagNumber(10)
+  void clearEventTypeName() => clearField(10);
+
+  @$pb.TagNumber(11)
+  $core.int get tUMOnlineEventID => $_getIZ(10);
+  @$pb.TagNumber(11)
+  set tUMOnlineEventID($core.int v) {
+    $_setUnsignedInt32(10, v);
+  }
+
+  @$pb.TagNumber(11)
+  $core.bool hasTUMOnlineEventID() => $_has(10);
+  @$pb.TagNumber(11)
+  void clearTUMOnlineEventID() => clearField(11);
+
+  @$pb.TagNumber(12)
+  $core.String get seriesIdentifier => $_getSZ(11);
+  @$pb.TagNumber(12)
+  set seriesIdentifier($core.String v) {
+    $_setString(11, v);
+  }
+
+  @$pb.TagNumber(12)
+  $core.bool hasSeriesIdentifier() => $_has(11);
+  @$pb.TagNumber(12)
+  void clearSeriesIdentifier() => clearField(12);
+
+  @$pb.TagNumber(13)
+  $core.String get playlistUrl => $_getSZ(12);
+  @$pb.TagNumber(13)
+  set playlistUrl($core.String v) {
+    $_setString(12, v);
+  }
+
+  @$pb.TagNumber(13)
+  $core.bool hasPlaylistUrl() => $_has(12);
+  @$pb.TagNumber(13)
+  void clearPlaylistUrl() => clearField(13);
+
+  @$pb.TagNumber(14)
+  $core.String get playlistUrlPRES => $_getSZ(13);
+  @$pb.TagNumber(14)
+  set playlistUrlPRES($core.String v) {
+    $_setString(13, v);
+  }
+
+  @$pb.TagNumber(14)
+  $core.bool hasPlaylistUrlPRES() => $_has(13);
+  @$pb.TagNumber(14)
+  void clearPlaylistUrlPRES() => clearField(14);
+
+  @$pb.TagNumber(15)
+  $core.String get playlistUrlCAM => $_getSZ(14);
+  @$pb.TagNumber(15)
+  set playlistUrlCAM($core.String v) {
+    $_setString(14, v);
+  }
+
+  @$pb.TagNumber(15)
+  $core.bool hasPlaylistUrlCAM() => $_has(14);
+  @$pb.TagNumber(15)
+  void clearPlaylistUrlCAM() => clearField(15);
+
+  @$pb.TagNumber(16)
+  $core.bool get liveNow => $_getBF(15);
+  @$pb.TagNumber(16)
+  set liveNow($core.bool v) {
+    $_setBool(15, v);
+  }
+
+  @$pb.TagNumber(16)
+  $core.bool hasLiveNow() => $_has(15);
+  @$pb.TagNumber(16)
+  void clearLiveNow() => clearField(16);
+
+  @$pb.TagNumber(17)
+  $1.Timestamp get liveNowTimestamp => $_getN(16);
+  @$pb.TagNumber(17)
+  set liveNowTimestamp($1.Timestamp v) {
+    setField(17, v);
+  }
+
+  @$pb.TagNumber(17)
+  $core.bool hasLiveNowTimestamp() => $_has(16);
+  @$pb.TagNumber(17)
+  void clearLiveNowTimestamp() => clearField(17);
+  @$pb.TagNumber(17)
+  $1.Timestamp ensureLiveNowTimestamp() => $_ensure(16);
+
+  @$pb.TagNumber(18)
+  $core.bool get recording => $_getBF(17);
+  @$pb.TagNumber(18)
+  set recording($core.bool v) {
+    $_setBool(17, v);
+  }
+
+  @$pb.TagNumber(18)
+  $core.bool hasRecording() => $_has(17);
+  @$pb.TagNumber(18)
+  void clearRecording() => clearField(18);
+
+  @$pb.TagNumber(19)
+  $core.bool get premiere => $_getBF(18);
+  @$pb.TagNumber(19)
+  set premiere($core.bool v) {
+    $_setBool(18, v);
+  }
+
+  @$pb.TagNumber(19)
+  $core.bool hasPremiere() => $_has(18);
+  @$pb.TagNumber(19)
+  void clearPremiere() => clearField(19);
+
+  @$pb.TagNumber(20)
+  $core.bool get ended => $_getBF(19);
+  @$pb.TagNumber(20)
+  set ended($core.bool v) {
+    $_setBool(19, v);
+  }
+
+  @$pb.TagNumber(20)
+  $core.bool hasEnded() => $_has(19);
+  @$pb.TagNumber(20)
+  void clearEnded() => clearField(20);
+
+  @$pb.TagNumber(21)
+  $core.int get vodViews => $_getIZ(20);
+  @$pb.TagNumber(21)
+  set vodViews($core.int v) {
+    $_setUnsignedInt32(20, v);
+  }
+
+  @$pb.TagNumber(21)
+  $core.bool hasVodViews() => $_has(20);
+  @$pb.TagNumber(21)
+  void clearVodViews() => clearField(21);
+
+  @$pb.TagNumber(22)
+  $core.int get startOffset => $_getIZ(21);
+  @$pb.TagNumber(22)
+  set startOffset($core.int v) {
+    $_setUnsignedInt32(21, v);
+  }
+
+  @$pb.TagNumber(22)
+  $core.bool hasStartOffset() => $_has(21);
+  @$pb.TagNumber(22)
+  void clearStartOffset() => clearField(22);
+
+  @$pb.TagNumber(23)
+  $core.int get endOffset => $_getIZ(22);
+  @$pb.TagNumber(23)
+  set endOffset($core.int v) {
+    $_setUnsignedInt32(22, v);
+  }
+
+  @$pb.TagNumber(23)
+  $core.bool hasEndOffset() => $_has(22);
+  @$pb.TagNumber(23)
+  void clearEndOffset() => clearField(23);
+
+  @$pb.TagNumber(28)
+  $core.int get duration => $_getIZ(23);
+  @$pb.TagNumber(28)
+  set duration($core.int v) {
+    $_setUnsignedInt32(23, v);
+  }
+
+  @$pb.TagNumber(28)
+  $core.bool hasDuration() => $_has(23);
+  @$pb.TagNumber(28)
+  void clearDuration() => clearField(28);
+
+  @$pb.TagNumber(29)
+  $core.List<Download> get downloads => $_getList(24);
+
+  @$pb.TagNumber(30)
+  $core.bool get isPlanned => $_getBF(25);
+  @$pb.TagNumber(30)
+  set isPlanned($core.bool v) {
+    $_setBool(25, v);
+  }
+
+  @$pb.TagNumber(30)
+  $core.bool hasIsPlanned() => $_has(25);
+  @$pb.TagNumber(30)
+  void clearIsPlanned() => clearField(30);
+
+  @$pb.TagNumber(31)
+  $core.bool get isComingUp => $_getBF(26);
+  @$pb.TagNumber(31)
+  set isComingUp($core.bool v) {
+    $_setBool(26, v);
+  }
+
+  @$pb.TagNumber(31)
+  $core.bool hasIsComingUp() => $_has(26);
+  @$pb.TagNumber(31)
+  void clearIsComingUp() => clearField(31);
+
+  @$pb.TagNumber(32)
+  $core.String get hLSUrl => $_getSZ(27);
+  @$pb.TagNumber(32)
+  set hLSUrl($core.String v) {
+    $_setString(27, v);
+  }
+
+  @$pb.TagNumber(32)
+  $core.bool hasHLSUrl() => $_has(27);
+  @$pb.TagNumber(32)
+  void clearHLSUrl() => clearField(32);
+}
+
+class GetStreamRequest extends $pb.GeneratedMessage {
+  factory GetStreamRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  GetStreamRequest._() : super();
+
+  factory GetStreamRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetStreamRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetStreamRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetStreamRequest clone() => GetStreamRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetStreamRequest copyWith(void Function(GetStreamRequest) updates) =>
+      super.copyWith((message) => updates(message as GetStreamRequest))
+          as GetStreamRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetStreamRequest create() => GetStreamRequest._();
+  GetStreamRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetStreamRequest> createRepeated() =>
+      $pb.PbList<GetStreamRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetStreamRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetStreamRequest>(create);
+  static GetStreamRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
+
+class GetNowLiveRequest extends $pb.GeneratedMessage {
+  factory GetNowLiveRequest() => create();
+  GetNowLiveRequest._() : super();
+
+  factory GetNowLiveRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetNowLiveRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetNowLiveRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetNowLiveRequest clone() => GetNowLiveRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetNowLiveRequest copyWith(void Function(GetNowLiveRequest) updates) =>
+      super.copyWith((message) => updates(message as GetNowLiveRequest))
+          as GetNowLiveRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetNowLiveRequest create() => GetNowLiveRequest._();
+  GetNowLiveRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetNowLiveRequest> createRepeated() =>
+      $pb.PbList<GetNowLiveRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetNowLiveRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetNowLiveRequest>(create);
+  static GetNowLiveRequest? _defaultInstance;
+}
+
+class GetThumbsLiveRequest extends $pb.GeneratedMessage {
+  factory GetThumbsLiveRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  GetThumbsLiveRequest._() : super();
+
+  factory GetThumbsLiveRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetThumbsLiveRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetThumbsLiveRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetThumbsLiveRequest clone() =>
+      GetThumbsLiveRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetThumbsLiveRequest copyWith(void Function(GetThumbsLiveRequest) updates) =>
+      super.copyWith((message) => updates(message as GetThumbsLiveRequest))
+          as GetThumbsLiveRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsLiveRequest create() => GetThumbsLiveRequest._();
+  GetThumbsLiveRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetThumbsLiveRequest> createRepeated() =>
+      $pb.PbList<GetThumbsLiveRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsLiveRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetThumbsLiveRequest>(create);
+  static GetThumbsLiveRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
+
+class GetThumbsVODRequest extends $pb.GeneratedMessage {
+  factory GetThumbsVODRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  GetThumbsVODRequest._() : super();
+
+  factory GetThumbsVODRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetThumbsVODRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetThumbsVODRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetThumbsVODRequest clone() => GetThumbsVODRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetThumbsVODRequest copyWith(void Function(GetThumbsVODRequest) updates) =>
+      super.copyWith((message) => updates(message as GetThumbsVODRequest))
+          as GetThumbsVODRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsVODRequest create() => GetThumbsVODRequest._();
+  GetThumbsVODRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetThumbsVODRequest> createRepeated() =>
+      $pb.PbList<GetThumbsVODRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsVODRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetThumbsVODRequest>(create);
+  static GetThumbsVODRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
+
+class GetStreamResponse extends $pb.GeneratedMessage {
+  factory GetStreamResponse({
+    Stream? stream,
+  }) {
+    final $result = create();
+    if (stream != null) {
+      $result.stream = stream;
+    }
+    return $result;
+  }
+  GetStreamResponse._() : super();
+
+  factory GetStreamResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetStreamResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetStreamResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Stream>(1, _omitFieldNames ? '' : 'stream', subBuilder: Stream.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetStreamResponse clone() => GetStreamResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetStreamResponse copyWith(void Function(GetStreamResponse) updates) =>
+      super.copyWith((message) => updates(message as GetStreamResponse))
+          as GetStreamResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetStreamResponse create() => GetStreamResponse._();
+  GetStreamResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetStreamResponse> createRepeated() =>
+      $pb.PbList<GetStreamResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetStreamResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetStreamResponse>(create);
+  static GetStreamResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Stream get stream => $_getN(0);
+  @$pb.TagNumber(1)
+  set stream(Stream v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStream() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStream() => clearField(1);
+  @$pb.TagNumber(1)
+  Stream ensureStream() => $_ensure(0);
+}
+
+class GetNowLiveResponse extends $pb.GeneratedMessage {
+  factory GetNowLiveResponse({
+    $core.Iterable<Stream>? stream,
+  }) {
+    final $result = create();
+    if (stream != null) {
+      $result.stream.addAll(stream);
+    }
+    return $result;
+  }
+  GetNowLiveResponse._() : super();
+
+  factory GetNowLiveResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetNowLiveResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetNowLiveResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..pc<Stream>(1, _omitFieldNames ? '' : 'stream', $pb.PbFieldType.PM,
+      subBuilder: Stream.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetNowLiveResponse clone() => GetNowLiveResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetNowLiveResponse copyWith(void Function(GetNowLiveResponse) updates) =>
+      super.copyWith((message) => updates(message as GetNowLiveResponse))
+          as GetNowLiveResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetNowLiveResponse create() => GetNowLiveResponse._();
+  GetNowLiveResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetNowLiveResponse> createRepeated() =>
+      $pb.PbList<GetNowLiveResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetNowLiveResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetNowLiveResponse>(create);
+  static GetNowLiveResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<Stream> get stream => $_getList(0);
+}
+
+class GetThumbsVODResponse extends $pb.GeneratedMessage {
+  factory GetThumbsVODResponse({
+    $core.String? path,
+  }) {
+    final $result = create();
+    if (path != null) {
+      $result.path = path;
+    }
+    return $result;
+  }
+  GetThumbsVODResponse._() : super();
+
+  factory GetThumbsVODResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetThumbsVODResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetThumbsVODResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'path')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetThumbsVODResponse clone() =>
+      GetThumbsVODResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetThumbsVODResponse copyWith(void Function(GetThumbsVODResponse) updates) =>
+      super.copyWith((message) => updates(message as GetThumbsVODResponse))
+          as GetThumbsVODResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsVODResponse create() => GetThumbsVODResponse._();
+  GetThumbsVODResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetThumbsVODResponse> createRepeated() =>
+      $pb.PbList<GetThumbsVODResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsVODResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetThumbsVODResponse>(create);
+  static GetThumbsVODResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get path => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set path($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasPath() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPath() => clearField(1);
+}
+
+class GetThumbsLiveResponse extends $pb.GeneratedMessage {
+  factory GetThumbsLiveResponse({
+    $core.String? path,
+  }) {
+    final $result = create();
+    if (path != null) {
+      $result.path = path;
+    }
+    return $result;
+  }
+  GetThumbsLiveResponse._() : super();
+
+  factory GetThumbsLiveResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetThumbsLiveResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetThumbsLiveResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'path')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetThumbsLiveResponse clone() =>
+      GetThumbsLiveResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetThumbsLiveResponse copyWith(
+    void Function(GetThumbsLiveResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as GetThumbsLiveResponse))
+          as GetThumbsLiveResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsLiveResponse create() => GetThumbsLiveResponse._();
+  GetThumbsLiveResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetThumbsLiveResponse> createRepeated() =>
+      $pb.PbList<GetThumbsLiveResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetThumbsLiveResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetThumbsLiveResponse>(create);
+  static GetThumbsLiveResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get path => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set path($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasPath() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPath() => clearField(1);
+}
+
+class Download extends $pb.GeneratedMessage {
+  factory Download({
+    $core.String? friendlyName,
+    $core.String? downloadURL,
+  }) {
+    final $result = create();
+    if (friendlyName != null) {
+      $result.friendlyName = friendlyName;
+    }
+    if (downloadURL != null) {
+      $result.downloadURL = downloadURL;
+    }
+    return $result;
+  }
+  Download._() : super();
+
+  factory Download.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Download.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Download',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOS(1, _omitFieldNames ? '' : 'friendlyName', protoName: 'friendlyName')
+    ..aOS(2, _omitFieldNames ? '' : 'downloadURL', protoName: 'downloadURL')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Download clone() => Download()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Download copyWith(void Function(Download) updates) =>
+      super.copyWith((message) => updates(message as Download)) as Download;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Download create() => Download._();
+  Download createEmptyInstance() => create();
+  static $pb.PbList<Download> createRepeated() => $pb.PbList<Download>();
+  @$core.pragma('dart2js:noInline')
+  static Download getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Download>(create);
+  static Download? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get friendlyName => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set friendlyName($core.String v) {
+    $_setString(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasFriendlyName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearFriendlyName() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get downloadURL => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set downloadURL($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasDownloadURL() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearDownloadURL() => clearField(2);
+}
+
+class Progress extends $pb.GeneratedMessage {
+  factory Progress({
+    $core.double? progress,
+    $core.bool? watched,
+    $core.int? userID,
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (progress != null) {
+      $result.progress = progress;
+    }
+    if (watched != null) {
+      $result.watched = watched;
+    }
+    if (userID != null) {
+      $result.userID = userID;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  Progress._() : super();
+
+  factory Progress.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory Progress.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Progress',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.double>(1, _omitFieldNames ? '' : 'progress', $pb.PbFieldType.OF)
+    ..aOB(2, _omitFieldNames ? '' : 'watched')
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'userID', $pb.PbFieldType.OU3,
+      protoName: 'userID',
+    )
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Progress clone() => Progress()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Progress copyWith(void Function(Progress) updates) =>
+      super.copyWith((message) => updates(message as Progress)) as Progress;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Progress create() => Progress._();
+  Progress createEmptyInstance() => create();
+  static $pb.PbList<Progress> createRepeated() => $pb.PbList<Progress>();
+  @$core.pragma('dart2js:noInline')
+  static Progress getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Progress>(create);
+  static Progress? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.double get progress => $_getN(0);
+  @$pb.TagNumber(1)
+  set progress($core.double v) {
+    $_setFloat(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasProgress() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearProgress() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.bool get watched => $_getBF(1);
+  @$pb.TagNumber(2)
+  set watched($core.bool v) {
+    $_setBool(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasWatched() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearWatched() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get userID => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set userID($core.int v) {
+    $_setUnsignedInt32(2, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasUserID() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearUserID() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get streamID => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(3, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasStreamID() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearStreamID() => clearField(4);
+}
+
+class GetProgressRequest extends $pb.GeneratedMessage {
+  factory GetProgressRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  GetProgressRequest._() : super();
+
+  factory GetProgressRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetProgressRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetProgressRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetProgressRequest clone() => GetProgressRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetProgressRequest copyWith(void Function(GetProgressRequest) updates) =>
+      super.copyWith((message) => updates(message as GetProgressRequest))
+          as GetProgressRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetProgressRequest create() => GetProgressRequest._();
+  GetProgressRequest createEmptyInstance() => create();
+
+  static $pb.PbList<GetProgressRequest> createRepeated() =>
+      $pb.PbList<GetProgressRequest>();
+  @$core.pragma('dart2js:noInline')
+  static GetProgressRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetProgressRequest>(create);
+  static GetProgressRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
+
+class PutProgressRequest extends $pb.GeneratedMessage {
+  factory PutProgressRequest({
+    $core.double? progress,
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (progress != null) {
+      $result.progress = progress;
+    }
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  PutProgressRequest._() : super();
+
+  factory PutProgressRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PutProgressRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PutProgressRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.double>(1, _omitFieldNames ? '' : 'progress', $pb.PbFieldType.OF)
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PutProgressRequest clone() => PutProgressRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PutProgressRequest copyWith(void Function(PutProgressRequest) updates) =>
+      super.copyWith((message) => updates(message as PutProgressRequest))
+          as PutProgressRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PutProgressRequest create() => PutProgressRequest._();
+  PutProgressRequest createEmptyInstance() => create();
+
+  static $pb.PbList<PutProgressRequest> createRepeated() =>
+      $pb.PbList<PutProgressRequest>();
+  @$core.pragma('dart2js:noInline')
+  static PutProgressRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PutProgressRequest>(create);
+  static PutProgressRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.double get progress => $_getN(0);
+  @$pb.TagNumber(1)
+  set progress($core.double v) {
+    $_setFloat(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasProgress() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearProgress() => clearField(1);
+
+  @$pb.TagNumber(3)
+  $core.int get streamID => $_getIZ(1);
+  @$pb.TagNumber(3)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasStreamID() => $_has(1);
+  @$pb.TagNumber(3)
+  void clearStreamID() => clearField(3);
+}
+
+class MarkAsWatchedRequest extends $pb.GeneratedMessage {
+  factory MarkAsWatchedRequest({
+    $core.int? streamID,
+  }) {
+    final $result = create();
+    if (streamID != null) {
+      $result.streamID = streamID;
+    }
+    return $result;
+  }
+  MarkAsWatchedRequest._() : super();
+
+  factory MarkAsWatchedRequest.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory MarkAsWatchedRequest.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MarkAsWatchedRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'streamID', $pb.PbFieldType.OU3,
+      protoName: 'streamID',
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  MarkAsWatchedRequest clone() =>
+      MarkAsWatchedRequest()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  MarkAsWatchedRequest copyWith(void Function(MarkAsWatchedRequest) updates) =>
+      super.copyWith((message) => updates(message as MarkAsWatchedRequest))
+          as MarkAsWatchedRequest;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MarkAsWatchedRequest create() => MarkAsWatchedRequest._();
+  MarkAsWatchedRequest createEmptyInstance() => create();
+
+  static $pb.PbList<MarkAsWatchedRequest> createRepeated() =>
+      $pb.PbList<MarkAsWatchedRequest>();
+  @$core.pragma('dart2js:noInline')
+  static MarkAsWatchedRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<MarkAsWatchedRequest>(create);
+  static MarkAsWatchedRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get streamID => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set streamID($core.int v) {
+    $_setUnsignedInt32(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasStreamID() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearStreamID() => clearField(1);
+}
+
+class GetProgressResponse extends $pb.GeneratedMessage {
+  factory GetProgressResponse({
+    Progress? progress,
+  }) {
+    final $result = create();
+    if (progress != null) {
+      $result.progress = progress;
+    }
+    return $result;
+  }
+  GetProgressResponse._() : super();
+
+  factory GetProgressResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory GetProgressResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GetProgressResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Progress>(1, _omitFieldNames ? '' : 'progress',
+      subBuilder: Progress.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GetProgressResponse clone() => GetProgressResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GetProgressResponse copyWith(void Function(GetProgressResponse) updates) =>
+      super.copyWith((message) => updates(message as GetProgressResponse))
+          as GetProgressResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GetProgressResponse create() => GetProgressResponse._();
+  GetProgressResponse createEmptyInstance() => create();
+
+  static $pb.PbList<GetProgressResponse> createRepeated() =>
+      $pb.PbList<GetProgressResponse>();
+  @$core.pragma('dart2js:noInline')
+  static GetProgressResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GetProgressResponse>(create);
+  static GetProgressResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Progress get progress => $_getN(0);
+  @$pb.TagNumber(1)
+  set progress(Progress v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasProgress() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearProgress() => clearField(1);
+  @$pb.TagNumber(1)
+  Progress ensureProgress() => $_ensure(0);
+}
+
+class PutProgressResponse extends $pb.GeneratedMessage {
+  factory PutProgressResponse({
+    Progress? progress,
+  }) {
+    final $result = create();
+    if (progress != null) {
+      $result.progress = progress;
+    }
+    return $result;
+  }
+  PutProgressResponse._() : super();
+
+  factory PutProgressResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory PutProgressResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PutProgressResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Progress>(1, _omitFieldNames ? '' : 'progress',
+      subBuilder: Progress.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  PutProgressResponse clone() => PutProgressResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  PutProgressResponse copyWith(void Function(PutProgressResponse) updates) =>
+      super.copyWith((message) => updates(message as PutProgressResponse))
+          as PutProgressResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static PutProgressResponse create() => PutProgressResponse._();
+  PutProgressResponse createEmptyInstance() => create();
+
+  static $pb.PbList<PutProgressResponse> createRepeated() =>
+      $pb.PbList<PutProgressResponse>();
+  @$core.pragma('dart2js:noInline')
+  static PutProgressResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<PutProgressResponse>(create);
+  static PutProgressResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Progress get progress => $_getN(0);
+  @$pb.TagNumber(1)
+  set progress(Progress v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasProgress() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearProgress() => clearField(1);
+  @$pb.TagNumber(1)
+  Progress ensureProgress() => $_ensure(0);
+}
+
+class MarkAsWatchedResponse extends $pb.GeneratedMessage {
+  factory MarkAsWatchedResponse({
+    Progress? progress,
+  }) {
+    final $result = create();
+    if (progress != null) {
+      $result.progress = progress;
+    }
+    return $result;
+  }
+  MarkAsWatchedResponse._() : super();
+
+  factory MarkAsWatchedResponse.fromBuffer(
+    $core.List<$core.int> i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromBuffer(i, r);
+
+  factory MarkAsWatchedResponse.fromJson(
+    $core.String i, [
+    $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY,
+  ]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MarkAsWatchedResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protobuf'),
+    createEmptyInstance: create,
+  )
+    ..aOM<Progress>(1, _omitFieldNames ? '' : 'progress',
+      subBuilder: Progress.create,
+    )
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  MarkAsWatchedResponse clone() =>
+      MarkAsWatchedResponse()..mergeFromMessage(this);
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  MarkAsWatchedResponse copyWith(
+    void Function(MarkAsWatchedResponse) updates,
+  ) =>
+      super.copyWith((message) => updates(message as MarkAsWatchedResponse))
+          as MarkAsWatchedResponse;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MarkAsWatchedResponse create() => MarkAsWatchedResponse._();
+  MarkAsWatchedResponse createEmptyInstance() => create();
+
+  static $pb.PbList<MarkAsWatchedResponse> createRepeated() =>
+      $pb.PbList<MarkAsWatchedResponse>();
+  @$core.pragma('dart2js:noInline')
+  static MarkAsWatchedResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<MarkAsWatchedResponse>(create);
+  static MarkAsWatchedResponse? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  Progress get progress => $_getN(0);
+  @$pb.TagNumber(1)
+  set progress(Progress v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasProgress() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearProgress() => clearField(1);
+  @$pb.TagNumber(1)
+  Progress ensureProgress() => $_ensure(0);
+}
 
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/base/networking/api/gocast/api_v2.pbenum.dart b/lib/base/networking/api/gocast/api_v2.pbenum.dart
index d3add77b..da250858 100644
--- a/lib/base/networking/api/gocast/api_v2.pbenum.dart
+++ b/lib/base/networking/api/gocast/api_v2.pbenum.dart
@@ -14,21 +14,24 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class UserSettingType extends $pb.ProtobufEnum {
-  static const UserSettingType PREFERRED_NAME = UserSettingType._(0, _omitEnumNames ? '' : 'PREFERRED_NAME');
-  static const UserSettingType GREETING = UserSettingType._(1, _omitEnumNames ? '' : 'GREETING');
-  static const UserSettingType CUSTOM_PLAYBACK_SPEEDS = UserSettingType._(2, _omitEnumNames ? '' : 'CUSTOM_PLAYBACK_SPEEDS');
-
-  static const $core.List<UserSettingType> values = <UserSettingType> [
+  static const UserSettingType PREFERRED_NAME =
+      UserSettingType._(0, _omitEnumNames ? '' : 'PREFERRED_NAME');
+  static const UserSettingType GREETING =
+      UserSettingType._(1, _omitEnumNames ? '' : 'GREETING');
+  static const UserSettingType CUSTOM_PLAYBACK_SPEEDS =
+      UserSettingType._(2, _omitEnumNames ? '' : 'CUSTOM_PLAYBACK_SPEEDS');
+
+  static const $core.List<UserSettingType> values = <UserSettingType>[
     PREFERRED_NAME,
     GREETING,
     CUSTOM_PLAYBACK_SPEEDS,
   ];
 
-  static final $core.Map<$core.int, UserSettingType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static final $core.Map<$core.int, UserSettingType> _byValue =
+      $pb.ProtobufEnum.initByValue(values);
   static UserSettingType? valueOf($core.int value) => _byValue[value];
 
   const UserSettingType._($core.int v, $core.String n) : super(v, n);
 }
 
-
 const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/lib/base/networking/api/gocast/api_v2.pbgrpc.dart b/lib/base/networking/api/gocast/api_v2.pbgrpc.dart
index 9385d45d..89139801 100644
--- a/lib/base/networking/api/gocast/api_v2.pbgrpc.dart
+++ b/lib/base/networking/api/gocast/api_v2.pbgrpc.dart
@@ -21,67 +21,504 @@ export 'api_v2.pb.dart';
 
 @$pb.GrpcServiceName('protobuf.API')
 class APIClient extends $grpc.Client {
-  static final _$getUser = $grpc.ClientMethod<$0.GetUserRequest, $0.GetUserResponse>(
-      '/protobuf.API/getUser',
-      ($0.GetUserRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetUserResponse.fromBuffer(value),
+  static final _$getUser =
+      $grpc.ClientMethod<$0.GetUserRequest, $0.GetUserResponse>(
+    '/protobuf.API/getUser',
+    ($0.GetUserRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetUserResponse.fromBuffer(value),
   );
-  static final _$getUserCourses = $grpc.ClientMethod<$0.GetUserCoursesRequest, $0.GetUserCoursesResponse>(
-      '/protobuf.API/getUserCourses',
-      ($0.GetUserCoursesRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetUserCoursesResponse.fromBuffer(value),
+  static final _$getUserCourses =
+      $grpc.ClientMethod<$0.GetUserCoursesRequest, $0.GetUserCoursesResponse>(
+    '/protobuf.API/getUserCourses',
+    ($0.GetUserCoursesRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetUserCoursesResponse.fromBuffer(value),
   );
-  static final _$getUserPinned = $grpc.ClientMethod<$0.GetUserPinnedRequest, $0.GetUserPinnedResponse>(
-      '/protobuf.API/getUserPinned',
-      ($0.GetUserPinnedRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetUserPinnedResponse.fromBuffer(value),
+  static final _$getUserPinned =
+      $grpc.ClientMethod<$0.GetUserPinnedRequest, $0.GetUserPinnedResponse>(
+    '/protobuf.API/getUserPinned',
+    ($0.GetUserPinnedRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetUserPinnedResponse.fromBuffer(value),
   );
-  static final _$getUserAdminCourses = $grpc.ClientMethod<$0.GetUserAdminRequest, $0.GetUserAdminResponse>(
-      '/protobuf.API/getUserAdminCourses',
-      ($0.GetUserAdminRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetUserAdminResponse.fromBuffer(value),
+  static final _$postUserPinned =
+      $grpc.ClientMethod<$0.PostPinnedRequest, $0.PostPinnedResponse>(
+    '/protobuf.API/postUserPinned',
+    ($0.PostPinnedRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.PostPinnedResponse.fromBuffer(value),
   );
-  static final _$getUserSettings = $grpc.ClientMethod<$0.GetUserSettingsRequest, $0.GetUserSettingsResponse>(
-      '/protobuf.API/getUserSettings',
-      ($0.GetUserSettingsRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetUserSettingsResponse.fromBuffer(value),
+  static final _$deleteUserPinned =
+      $grpc.ClientMethod<$0.DeletePinnedRequest, $0.DeletePinnedResponse>(
+    '/protobuf.API/deleteUserPinned',
+    ($0.DeletePinnedRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.DeletePinnedResponse.fromBuffer(value),
   );
-  static final _$getUserBookmarks = $grpc.ClientMethod<$0.GetBookmarksRequest, $0.GetBookmarksResponse>(
-      '/protobuf.API/getUserBookmarks',
-      ($0.GetBookmarksRequest value) => value.writeToBuffer(),
-      ($core.List<$core.int> value) => $0.GetBookmarksResponse.fromBuffer(value),
+  static final _$getUserAdminCourses =
+      $grpc.ClientMethod<$0.GetUserAdminRequest, $0.GetUserAdminResponse>(
+    '/protobuf.API/getUserAdminCourses',
+    ($0.GetUserAdminRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetUserAdminResponse.fromBuffer(value),
   );
-
-  APIClient($grpc.ClientChannel channel,
-      {$grpc.CallOptions? options,
-      $core.Iterable<$grpc.ClientInterceptor>? interceptors,})
-      : super(channel, options: options,
-        interceptors: interceptors,
+  static final _$getUserSettings =
+      $grpc.ClientMethod<$0.GetUserSettingsRequest, $0.GetUserSettingsResponse>(
+    '/protobuf.API/getUserSettings',
+    ($0.GetUserSettingsRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetUserSettingsResponse.fromBuffer(value),
+  );
+  static final _$patchUserSettings = $grpc.ClientMethod<
+      $0.PatchUserSettingsRequest, $0.PatchUserSettingsResponse>(
+    '/protobuf.API/patchUserSettings',
+    ($0.PatchUserSettingsRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.PatchUserSettingsResponse.fromBuffer(value),
+  );
+  static final _$getUserBookmarks =
+      $grpc.ClientMethod<$0.GetBookmarksRequest, $0.GetBookmarksResponse>(
+    '/protobuf.API/getUserBookmarks',
+    ($0.GetBookmarksRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetBookmarksResponse.fromBuffer(value),
+  );
+  static final _$putUserBookmark =
+      $grpc.ClientMethod<$0.PutBookmarkRequest, $0.PutBookmarkResponse>(
+    '/protobuf.API/putUserBookmark',
+    ($0.PutBookmarkRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.PutBookmarkResponse.fromBuffer(value),
+  );
+  static final _$patchUserBookmark =
+      $grpc.ClientMethod<$0.PatchBookmarkRequest, $0.PatchBookmarkResponse>(
+    '/protobuf.API/patchUserBookmark',
+    ($0.PatchBookmarkRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.PatchBookmarkResponse.fromBuffer(value),
+  );
+  static final _$deleteUserBookmark =
+      $grpc.ClientMethod<$0.DeleteBookmarkRequest, $0.DeleteBookmarkResponse>(
+    '/protobuf.API/deleteUserBookmark',
+    ($0.DeleteBookmarkRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.DeleteBookmarkResponse.fromBuffer(value),
+  );
+  static final _$getBannerAlerts =
+      $grpc.ClientMethod<$0.GetBannerAlertsRequest, $0.GetBannerAlertsResponse>(
+    '/protobuf.API/getBannerAlerts',
+    ($0.GetBannerAlertsRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetBannerAlertsResponse.fromBuffer(value),
+  );
+  static final _$getFeatureNotifications = $grpc.ClientMethod<
+      $0.GetFeatureNotificationsRequest, $0.GetFeatureNotificationsResponse>(
+    '/protobuf.API/getFeatureNotifications',
+    ($0.GetFeatureNotificationsRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetFeatureNotificationsResponse.fromBuffer(value),
+  );
+  static final _$postDeviceToken =
+      $grpc.ClientMethod<$0.PostDeviceTokenRequest, $0.PostDeviceTokenResponse>(
+    '/protobuf.API/postDeviceToken',
+    ($0.PostDeviceTokenRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.PostDeviceTokenResponse.fromBuffer(value),
+  );
+  static final _$deleteDeviceToken = $grpc.ClientMethod<
+      $0.DeleteDeviceTokenRequest, $0.DeleteDeviceTokenResponse>(
+    '/protobuf.API/deleteDeviceToken',
+    ($0.DeleteDeviceTokenRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.DeleteDeviceTokenResponse.fromBuffer(value),
+  );
+  static final _$getPublicCourses = $grpc.ClientMethod<
+      $0.GetPublicCoursesRequest, $0.GetPublicCoursesResponse>(
+    '/protobuf.API/getPublicCourses',
+    ($0.GetPublicCoursesRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetPublicCoursesResponse.fromBuffer(value),
+  );
+  static final _$getSemesters =
+      $grpc.ClientMethod<$0.GetSemestersRequest, $0.GetSemestersResponse>(
+    '/protobuf.API/getSemesters',
+    ($0.GetSemestersRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetSemestersResponse.fromBuffer(value),
+  );
+  static final _$getCourseStreams = $grpc.ClientMethod<
+      $0.GetCourseStreamsRequest, $0.GetCourseStreamsResponse>(
+    '/protobuf.API/getCourseStreams',
+    ($0.GetCourseStreamsRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetCourseStreamsResponse.fromBuffer(value),
+  );
+  static final _$getStream =
+      $grpc.ClientMethod<$0.GetStreamRequest, $0.GetStreamResponse>(
+    '/protobuf.API/GetStream',
+    ($0.GetStreamRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetStreamResponse.fromBuffer(value),
+  );
+  static final _$getNowLive =
+      $grpc.ClientMethod<$0.GetNowLiveRequest, $0.GetNowLiveResponse>(
+    '/protobuf.API/GetNowLive',
+    ($0.GetNowLiveRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetNowLiveResponse.fromBuffer(value),
+  );
+  static final _$getThumbsVOD =
+      $grpc.ClientMethod<$0.GetThumbsVODRequest, $0.GetThumbsVODResponse>(
+    '/protobuf.API/getThumbsVOD',
+    ($0.GetThumbsVODRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetThumbsVODResponse.fromBuffer(value),
+  );
+  static final _$getThumbsLive =
+      $grpc.ClientMethod<$0.GetThumbsLiveRequest, $0.GetThumbsLiveResponse>(
+    '/protobuf.API/getThumbsLive',
+    ($0.GetThumbsLiveRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetThumbsLiveResponse.fromBuffer(value),
   );
+  static final _$getProgress =
+      $grpc.ClientMethod<$0.GetProgressRequest, $0.GetProgressResponse>(
+    '/protobuf.API/getProgress',
+    ($0.GetProgressRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetProgressResponse.fromBuffer(value),
+  );
+  static final _$putProgress =
+      $grpc.ClientMethod<$0.PutProgressRequest, $0.PutProgressResponse>(
+    '/protobuf.API/putProgress',
+    ($0.PutProgressRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.PutProgressResponse.fromBuffer(value),
+  );
+  static final _$markAsWatched =
+      $grpc.ClientMethod<$0.MarkAsWatchedRequest, $0.MarkAsWatchedResponse>(
+    '/protobuf.API/markAsWatched',
+    ($0.MarkAsWatchedRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.MarkAsWatchedResponse.fromBuffer(value),
+  );
+  static final _$getChatMessages =
+      $grpc.ClientMethod<$0.GetChatMessagesRequest, $0.GetChatMessagesResponse>(
+    '/protobuf.API/getChatMessages',
+    ($0.GetChatMessagesRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.GetChatMessagesResponse.fromBuffer(value),
+  );
+  static final _$postChatMessage =
+      $grpc.ClientMethod<$0.PostChatMessageRequest, $0.PostChatMessageResponse>(
+    '/protobuf.API/postChatMessage',
+    ($0.PostChatMessageRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.PostChatMessageResponse.fromBuffer(value),
+  );
+  static final _$postChatReaction = $grpc.ClientMethod<
+      $0.PostChatReactionRequest, $0.PostChatReactionResponse>(
+    '/protobuf.API/postChatReaction',
+    ($0.PostChatReactionRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.PostChatReactionResponse.fromBuffer(value),
+  );
+  static final _$deleteChatReaction = $grpc.ClientMethod<
+      $0.DeleteChatReactionRequest, $0.DeleteChatReactionResponse>(
+    '/protobuf.API/deleteChatReaction',
+    ($0.DeleteChatReactionRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.DeleteChatReactionResponse.fromBuffer(value),
+  );
+  static final _$postChatReply =
+      $grpc.ClientMethod<$0.PostChatReplyRequest, $0.PostChatReplyResponse>(
+    '/protobuf.API/postChatReply',
+    ($0.PostChatReplyRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.PostChatReplyResponse.fromBuffer(value),
+  );
+  static final _$markChatMessageAsResolved = $grpc.ClientMethod<
+      $0.MarkChatMessageAsResolvedRequest,
+      $0.MarkChatMessageAsResolvedResponse>(
+    '/protobuf.API/markChatMessageAsResolved',
+    ($0.MarkChatMessageAsResolvedRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.MarkChatMessageAsResolvedResponse.fromBuffer(value),
+  );
+  static final _$markChatMessageAsUnresolved = $grpc.ClientMethod<
+      $0.MarkChatMessageAsUnresolvedRequest,
+      $0.MarkChatMessageAsUnresolvedResponse>(
+    '/protobuf.API/markChatMessageAsUnresolved',
+    ($0.MarkChatMessageAsUnresolvedRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) =>
+        $0.MarkChatMessageAsUnresolvedResponse.fromBuffer(value),
+  );
+  static final _$getPolls =
+      $grpc.ClientMethod<$0.GetPollsRequest, $0.GetPollsResponse>(
+    '/protobuf.API/getPolls',
+    ($0.GetPollsRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.GetPollsResponse.fromBuffer(value),
+  );
+  static final _$postPollVote =
+      $grpc.ClientMethod<$0.PostPollVoteRequest, $0.PostPollVoteResponse>(
+    '/protobuf.API/postPollVote',
+    ($0.PostPollVoteRequest value) => value.writeToBuffer(),
+    ($core.List<$core.int> value) => $0.PostPollVoteResponse.fromBuffer(value),
+  );
+
+  APIClient(
+    $grpc.ClientChannel channel, {
+    $grpc.CallOptions? options,
+    $core.Iterable<$grpc.ClientInterceptor>? interceptors,
+  }) : super(
+          channel,
+          options: options,
+          interceptors: interceptors,
+        );
 
-  $grpc.ResponseFuture<$0.GetUserResponse> getUser($0.GetUserRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetUserResponse> getUser(
+    $0.GetUserRequest request, {
+    $grpc.CallOptions? options,
+  }) {
     return $createUnaryCall(_$getUser, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.GetUserCoursesResponse> getUserCourses($0.GetUserCoursesRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetUserCoursesResponse> getUserCourses(
+    $0.GetUserCoursesRequest request, {
+    $grpc.CallOptions? options,
+  }) {
     return $createUnaryCall(_$getUserCourses, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.GetUserPinnedResponse> getUserPinned($0.GetUserPinnedRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetUserPinnedResponse> getUserPinned(
+    $0.GetUserPinnedRequest request, {
+    $grpc.CallOptions? options,
+  }) {
     return $createUnaryCall(_$getUserPinned, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.GetUserAdminResponse> getUserAdminCourses($0.GetUserAdminRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.PostPinnedResponse> postUserPinned(
+    $0.PostPinnedRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$postUserPinned, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeletePinnedResponse> deleteUserPinned(
+    $0.DeletePinnedRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$deleteUserPinned, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetUserAdminResponse> getUserAdminCourses(
+    $0.GetUserAdminRequest request, {
+    $grpc.CallOptions? options,
+  }) {
     return $createUnaryCall(_$getUserAdminCourses, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.GetUserSettingsResponse> getUserSettings($0.GetUserSettingsRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.GetUserSettingsResponse> getUserSettings(
+    $0.GetUserSettingsRequest request, {
+    $grpc.CallOptions? options,
+  }) {
     return $createUnaryCall(_$getUserSettings, request, options: options);
   }
 
-  $grpc.ResponseFuture<$0.GetBookmarksResponse> getUserBookmarks($0.GetBookmarksRequest request, {$grpc.CallOptions? options}) {
+  $grpc.ResponseFuture<$0.PatchUserSettingsResponse> patchUserSettings(
+    $0.PatchUserSettingsRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$patchUserSettings, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetBookmarksResponse> getUserBookmarks(
+    $0.GetBookmarksRequest request, {
+    $grpc.CallOptions? options,
+  }) {
     return $createUnaryCall(_$getUserBookmarks, request, options: options);
   }
+
+  $grpc.ResponseFuture<$0.PutBookmarkResponse> putUserBookmark(
+    $0.PutBookmarkRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$putUserBookmark, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PatchBookmarkResponse> patchUserBookmark(
+    $0.PatchBookmarkRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$patchUserBookmark, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeleteBookmarkResponse> deleteUserBookmark(
+    $0.DeleteBookmarkRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$deleteUserBookmark, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetBannerAlertsResponse> getBannerAlerts(
+    $0.GetBannerAlertsRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getBannerAlerts, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetFeatureNotificationsResponse>
+      getFeatureNotifications(
+    $0.GetFeatureNotificationsRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(
+      _$getFeatureNotifications,
+      request,
+      options: options,
+    );
+  }
+
+  $grpc.ResponseFuture<$0.PostDeviceTokenResponse> postDeviceToken(
+    $0.PostDeviceTokenRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$postDeviceToken, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeleteDeviceTokenResponse> deleteDeviceToken(
+    $0.DeleteDeviceTokenRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$deleteDeviceToken, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetPublicCoursesResponse> getPublicCourses(
+    $0.GetPublicCoursesRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getPublicCourses, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetSemestersResponse> getSemesters(
+    $0.GetSemestersRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getSemesters, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetCourseStreamsResponse> getCourseStreams(
+    $0.GetCourseStreamsRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getCourseStreams, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetStreamResponse> getStream(
+    $0.GetStreamRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getStream, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetNowLiveResponse> getNowLive(
+    $0.GetNowLiveRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getNowLive, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetThumbsVODResponse> getThumbsVOD(
+    $0.GetThumbsVODRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getThumbsVOD, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetThumbsLiveResponse> getThumbsLive(
+    $0.GetThumbsLiveRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getThumbsLive, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetProgressResponse> getProgress(
+    $0.GetProgressRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getProgress, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PutProgressResponse> putProgress(
+    $0.PutProgressRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$putProgress, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.MarkAsWatchedResponse> markAsWatched(
+    $0.MarkAsWatchedRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$markAsWatched, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetChatMessagesResponse> getChatMessages(
+    $0.GetChatMessagesRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getChatMessages, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PostChatMessageResponse> postChatMessage(
+    $0.PostChatMessageRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$postChatMessage, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PostChatReactionResponse> postChatReaction(
+    $0.PostChatReactionRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$postChatReaction, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeleteChatReactionResponse> deleteChatReaction(
+    $0.DeleteChatReactionRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$deleteChatReaction, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PostChatReplyResponse> postChatReply(
+    $0.PostChatReplyRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$postChatReply, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.MarkChatMessageAsResolvedResponse>
+      markChatMessageAsResolved(
+    $0.MarkChatMessageAsResolvedRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(
+      _$markChatMessageAsResolved,
+      request,
+      options: options,
+    );
+  }
+
+  $grpc.ResponseFuture<$0.MarkChatMessageAsUnresolvedResponse>
+      markChatMessageAsUnresolved(
+    $0.MarkChatMessageAsUnresolvedRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(
+      _$markChatMessageAsUnresolved,
+      request,
+      options: options,
+    );
+  }
+
+  $grpc.ResponseFuture<$0.GetPollsResponse> getPolls(
+    $0.GetPollsRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$getPolls, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PostPollVoteResponse> postPollVote(
+    $0.PostPollVoteRequest request, {
+    $grpc.CallOptions? options,
+  }) {
+    return $createUnaryCall(_$postPollVote, request, options: options);
+  }
 }
 
 @$pb.GrpcServiceName('protobuf.API')
@@ -89,90 +526,788 @@ abstract class APIServiceBase extends $grpc.Service {
   $core.String get $name => 'protobuf.API';
 
   APIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.GetUserRequest, $0.GetUserResponse>(
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetUserRequest, $0.GetUserResponse>(
         'getUser',
         getUser_Pre,
         false,
         false,
         ($core.List<$core.int> value) => $0.GetUserRequest.fromBuffer(value),
         ($0.GetUserResponse value) => value.writeToBuffer(),
-    ),
+      ),
     );
-    $addMethod($grpc.ServiceMethod<$0.GetUserCoursesRequest, $0.GetUserCoursesResponse>(
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetUserCoursesRequest, $0.GetUserCoursesResponse>(
         'getUserCourses',
         getUserCourses_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $0.GetUserCoursesRequest.fromBuffer(value),
+        ($core.List<$core.int> value) =>
+            $0.GetUserCoursesRequest.fromBuffer(value),
         ($0.GetUserCoursesResponse value) => value.writeToBuffer(),
-    ),
+      ),
     );
-    $addMethod($grpc.ServiceMethod<$0.GetUserPinnedRequest, $0.GetUserPinnedResponse>(
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetUserPinnedRequest, $0.GetUserPinnedResponse>(
         'getUserPinned',
         getUserPinned_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $0.GetUserPinnedRequest.fromBuffer(value),
+        ($core.List<$core.int> value) =>
+            $0.GetUserPinnedRequest.fromBuffer(value),
         ($0.GetUserPinnedResponse value) => value.writeToBuffer(),
-    ),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PostPinnedRequest, $0.PostPinnedResponse>(
+        'postUserPinned',
+        postUserPinned_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.PostPinnedRequest.fromBuffer(value),
+        ($0.PostPinnedResponse value) => value.writeToBuffer(),
+      ),
     );
-    $addMethod($grpc.ServiceMethod<$0.GetUserAdminRequest, $0.GetUserAdminResponse>(
+    $addMethod(
+      $grpc.ServiceMethod<$0.DeletePinnedRequest, $0.DeletePinnedResponse>(
+        'deleteUserPinned',
+        deleteUserPinned_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.DeletePinnedRequest.fromBuffer(value),
+        ($0.DeletePinnedResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetUserAdminRequest, $0.GetUserAdminResponse>(
         'getUserAdminCourses',
         getUserAdminCourses_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $0.GetUserAdminRequest.fromBuffer(value),
+        ($core.List<$core.int> value) =>
+            $0.GetUserAdminRequest.fromBuffer(value),
         ($0.GetUserAdminResponse value) => value.writeToBuffer(),
-    ),
+      ),
     );
-    $addMethod($grpc.ServiceMethod<$0.GetUserSettingsRequest, $0.GetUserSettingsResponse>(
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetUserSettingsRequest,
+          $0.GetUserSettingsResponse>(
         'getUserSettings',
         getUserSettings_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $0.GetUserSettingsRequest.fromBuffer(value),
+        ($core.List<$core.int> value) =>
+            $0.GetUserSettingsRequest.fromBuffer(value),
         ($0.GetUserSettingsResponse value) => value.writeToBuffer(),
-    ),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PatchUserSettingsRequest,
+          $0.PatchUserSettingsResponse>(
+        'patchUserSettings',
+        patchUserSettings_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PatchUserSettingsRequest.fromBuffer(value),
+        ($0.PatchUserSettingsResponse value) => value.writeToBuffer(),
+      ),
     );
-    $addMethod($grpc.ServiceMethod<$0.GetBookmarksRequest, $0.GetBookmarksResponse>(
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetBookmarksRequest, $0.GetBookmarksResponse>(
         'getUserBookmarks',
         getUserBookmarks_Pre,
         false,
         false,
-        ($core.List<$core.int> value) => $0.GetBookmarksRequest.fromBuffer(value),
+        ($core.List<$core.int> value) =>
+            $0.GetBookmarksRequest.fromBuffer(value),
         ($0.GetBookmarksResponse value) => value.writeToBuffer(),
-    ),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PutBookmarkRequest, $0.PutBookmarkResponse>(
+        'putUserBookmark',
+        putUserBookmark_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PutBookmarkRequest.fromBuffer(value),
+        ($0.PutBookmarkResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PatchBookmarkRequest, $0.PatchBookmarkResponse>(
+        'patchUserBookmark',
+        patchUserBookmark_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PatchBookmarkRequest.fromBuffer(value),
+        ($0.PatchBookmarkResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.DeleteBookmarkRequest, $0.DeleteBookmarkResponse>(
+        'deleteUserBookmark',
+        deleteUserBookmark_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.DeleteBookmarkRequest.fromBuffer(value),
+        ($0.DeleteBookmarkResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetBannerAlertsRequest,
+          $0.GetBannerAlertsResponse>(
+        'getBannerAlerts',
+        getBannerAlerts_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetBannerAlertsRequest.fromBuffer(value),
+        ($0.GetBannerAlertsResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetFeatureNotificationsRequest,
+          $0.GetFeatureNotificationsResponse>(
+        'getFeatureNotifications',
+        getFeatureNotifications_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetFeatureNotificationsRequest.fromBuffer(value),
+        ($0.GetFeatureNotificationsResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PostDeviceTokenRequest,
+          $0.PostDeviceTokenResponse>(
+        'postDeviceToken',
+        postDeviceToken_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PostDeviceTokenRequest.fromBuffer(value),
+        ($0.PostDeviceTokenResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.DeleteDeviceTokenRequest,
+          $0.DeleteDeviceTokenResponse>(
+        'deleteDeviceToken',
+        deleteDeviceToken_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.DeleteDeviceTokenRequest.fromBuffer(value),
+        ($0.DeleteDeviceTokenResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetPublicCoursesRequest,
+          $0.GetPublicCoursesResponse>(
+        'getPublicCourses',
+        getPublicCourses_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetPublicCoursesRequest.fromBuffer(value),
+        ($0.GetPublicCoursesResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetSemestersRequest, $0.GetSemestersResponse>(
+        'getSemesters',
+        getSemesters_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetSemestersRequest.fromBuffer(value),
+        ($0.GetSemestersResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetCourseStreamsRequest,
+          $0.GetCourseStreamsResponse>(
+        'getCourseStreams',
+        getCourseStreams_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetCourseStreamsRequest.fromBuffer(value),
+        ($0.GetCourseStreamsResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetStreamRequest, $0.GetStreamResponse>(
+        'GetStream',
+        getStream_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.GetStreamRequest.fromBuffer(value),
+        ($0.GetStreamResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetNowLiveRequest, $0.GetNowLiveResponse>(
+        'GetNowLive',
+        getNowLive_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.GetNowLiveRequest.fromBuffer(value),
+        ($0.GetNowLiveResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetThumbsVODRequest, $0.GetThumbsVODResponse>(
+        'getThumbsVOD',
+        getThumbsVOD_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetThumbsVODRequest.fromBuffer(value),
+        ($0.GetThumbsVODResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetThumbsLiveRequest, $0.GetThumbsLiveResponse>(
+        'getThumbsLive',
+        getThumbsLive_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetThumbsLiveRequest.fromBuffer(value),
+        ($0.GetThumbsLiveResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetProgressRequest, $0.GetProgressResponse>(
+        'getProgress',
+        getProgress_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetProgressRequest.fromBuffer(value),
+        ($0.GetProgressResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PutProgressRequest, $0.PutProgressResponse>(
+        'putProgress',
+        putProgress_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PutProgressRequest.fromBuffer(value),
+        ($0.PutProgressResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.MarkAsWatchedRequest, $0.MarkAsWatchedResponse>(
+        'markAsWatched',
+        markAsWatched_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.MarkAsWatchedRequest.fromBuffer(value),
+        ($0.MarkAsWatchedResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetChatMessagesRequest,
+          $0.GetChatMessagesResponse>(
+        'getChatMessages',
+        getChatMessages_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.GetChatMessagesRequest.fromBuffer(value),
+        ($0.GetChatMessagesResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PostChatMessageRequest,
+          $0.PostChatMessageResponse>(
+        'postChatMessage',
+        postChatMessage_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PostChatMessageRequest.fromBuffer(value),
+        ($0.PostChatMessageResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PostChatReactionRequest,
+          $0.PostChatReactionResponse>(
+        'postChatReaction',
+        postChatReaction_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PostChatReactionRequest.fromBuffer(value),
+        ($0.PostChatReactionResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.DeleteChatReactionRequest,
+          $0.DeleteChatReactionResponse>(
+        'deleteChatReaction',
+        deleteChatReaction_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.DeleteChatReactionRequest.fromBuffer(value),
+        ($0.DeleteChatReactionResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PostChatReplyRequest, $0.PostChatReplyResponse>(
+        'postChatReply',
+        postChatReply_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PostChatReplyRequest.fromBuffer(value),
+        ($0.PostChatReplyResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.MarkChatMessageAsResolvedRequest,
+          $0.MarkChatMessageAsResolvedResponse>(
+        'markChatMessageAsResolved',
+        markChatMessageAsResolved_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.MarkChatMessageAsResolvedRequest.fromBuffer(value),
+        ($0.MarkChatMessageAsResolvedResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.MarkChatMessageAsUnresolvedRequest,
+          $0.MarkChatMessageAsUnresolvedResponse>(
+        'markChatMessageAsUnresolved',
+        markChatMessageAsUnresolved_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.MarkChatMessageAsUnresolvedRequest.fromBuffer(value),
+        ($0.MarkChatMessageAsUnresolvedResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.GetPollsRequest, $0.GetPollsResponse>(
+        'getPolls',
+        getPolls_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) => $0.GetPollsRequest.fromBuffer(value),
+        ($0.GetPollsResponse value) => value.writeToBuffer(),
+      ),
+    );
+    $addMethod(
+      $grpc.ServiceMethod<$0.PostPollVoteRequest, $0.PostPollVoteResponse>(
+        'postPollVote',
+        postPollVote_Pre,
+        false,
+        false,
+        ($core.List<$core.int> value) =>
+            $0.PostPollVoteRequest.fromBuffer(value),
+        ($0.PostPollVoteResponse value) => value.writeToBuffer(),
+      ),
     );
   }
 
-  $async.Future<$0.GetUserResponse> getUser_Pre($grpc.ServiceCall call, $async.Future<$0.GetUserRequest> request) async {
+  $async.Future<$0.GetUserResponse> getUser_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetUserRequest> request,
+  ) async {
     return getUser(call, await request);
   }
 
-  $async.Future<$0.GetUserCoursesResponse> getUserCourses_Pre($grpc.ServiceCall call, $async.Future<$0.GetUserCoursesRequest> request) async {
+  $async.Future<$0.GetUserCoursesResponse> getUserCourses_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetUserCoursesRequest> request,
+  ) async {
     return getUserCourses(call, await request);
   }
 
-  $async.Future<$0.GetUserPinnedResponse> getUserPinned_Pre($grpc.ServiceCall call, $async.Future<$0.GetUserPinnedRequest> request) async {
+  $async.Future<$0.GetUserPinnedResponse> getUserPinned_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetUserPinnedRequest> request,
+  ) async {
     return getUserPinned(call, await request);
   }
 
-  $async.Future<$0.GetUserAdminResponse> getUserAdminCourses_Pre($grpc.ServiceCall call, $async.Future<$0.GetUserAdminRequest> request) async {
+  $async.Future<$0.PostPinnedResponse> postUserPinned_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PostPinnedRequest> request,
+  ) async {
+    return postUserPinned(call, await request);
+  }
+
+  $async.Future<$0.DeletePinnedResponse> deleteUserPinned_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.DeletePinnedRequest> request,
+  ) async {
+    return deleteUserPinned(call, await request);
+  }
+
+  $async.Future<$0.GetUserAdminResponse> getUserAdminCourses_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetUserAdminRequest> request,
+  ) async {
     return getUserAdminCourses(call, await request);
   }
 
-  $async.Future<$0.GetUserSettingsResponse> getUserSettings_Pre($grpc.ServiceCall call, $async.Future<$0.GetUserSettingsRequest> request) async {
+  $async.Future<$0.GetUserSettingsResponse> getUserSettings_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetUserSettingsRequest> request,
+  ) async {
     return getUserSettings(call, await request);
   }
 
-  $async.Future<$0.GetBookmarksResponse> getUserBookmarks_Pre($grpc.ServiceCall call, $async.Future<$0.GetBookmarksRequest> request) async {
+  $async.Future<$0.PatchUserSettingsResponse> patchUserSettings_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PatchUserSettingsRequest> request,
+  ) async {
+    return patchUserSettings(call, await request);
+  }
+
+  $async.Future<$0.GetBookmarksResponse> getUserBookmarks_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetBookmarksRequest> request,
+  ) async {
     return getUserBookmarks(call, await request);
   }
 
-  $async.Future<$0.GetUserResponse> getUser($grpc.ServiceCall call, $0.GetUserRequest request);
-  $async.Future<$0.GetUserCoursesResponse> getUserCourses($grpc.ServiceCall call, $0.GetUserCoursesRequest request);
-  $async.Future<$0.GetUserPinnedResponse> getUserPinned($grpc.ServiceCall call, $0.GetUserPinnedRequest request);
-  $async.Future<$0.GetUserAdminResponse> getUserAdminCourses($grpc.ServiceCall call, $0.GetUserAdminRequest request);
-  $async.Future<$0.GetUserSettingsResponse> getUserSettings($grpc.ServiceCall call, $0.GetUserSettingsRequest request);
-  $async.Future<$0.GetBookmarksResponse> getUserBookmarks($grpc.ServiceCall call, $0.GetBookmarksRequest request);
+  $async.Future<$0.PutBookmarkResponse> putUserBookmark_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PutBookmarkRequest> request,
+  ) async {
+    return putUserBookmark(call, await request);
+  }
+
+  $async.Future<$0.PatchBookmarkResponse> patchUserBookmark_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PatchBookmarkRequest> request,
+  ) async {
+    return patchUserBookmark(call, await request);
+  }
+
+  $async.Future<$0.DeleteBookmarkResponse> deleteUserBookmark_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.DeleteBookmarkRequest> request,
+  ) async {
+    return deleteUserBookmark(call, await request);
+  }
+
+  $async.Future<$0.GetBannerAlertsResponse> getBannerAlerts_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetBannerAlertsRequest> request,
+  ) async {
+    return getBannerAlerts(call, await request);
+  }
+
+  $async.Future<$0.GetFeatureNotificationsResponse> getFeatureNotifications_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetFeatureNotificationsRequest> request,
+  ) async {
+    return getFeatureNotifications(call, await request);
+  }
+
+  $async.Future<$0.PostDeviceTokenResponse> postDeviceToken_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PostDeviceTokenRequest> request,
+  ) async {
+    return postDeviceToken(call, await request);
+  }
+
+  $async.Future<$0.DeleteDeviceTokenResponse> deleteDeviceToken_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.DeleteDeviceTokenRequest> request,
+  ) async {
+    return deleteDeviceToken(call, await request);
+  }
+
+  $async.Future<$0.GetPublicCoursesResponse> getPublicCourses_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetPublicCoursesRequest> request,
+  ) async {
+    return getPublicCourses(call, await request);
+  }
+
+  $async.Future<$0.GetSemestersResponse> getSemesters_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetSemestersRequest> request,
+  ) async {
+    return getSemesters(call, await request);
+  }
+
+  $async.Future<$0.GetCourseStreamsResponse> getCourseStreams_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetCourseStreamsRequest> request,
+  ) async {
+    return getCourseStreams(call, await request);
+  }
+
+  $async.Future<$0.GetStreamResponse> getStream_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetStreamRequest> request,
+  ) async {
+    return getStream(call, await request);
+  }
+
+  $async.Future<$0.GetNowLiveResponse> getNowLive_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetNowLiveRequest> request,
+  ) async {
+    return getNowLive(call, await request);
+  }
+
+  $async.Future<$0.GetThumbsVODResponse> getThumbsVOD_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetThumbsVODRequest> request,
+  ) async {
+    return getThumbsVOD(call, await request);
+  }
+
+  $async.Future<$0.GetThumbsLiveResponse> getThumbsLive_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetThumbsLiveRequest> request,
+  ) async {
+    return getThumbsLive(call, await request);
+  }
+
+  $async.Future<$0.GetProgressResponse> getProgress_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetProgressRequest> request,
+  ) async {
+    return getProgress(call, await request);
+  }
+
+  $async.Future<$0.PutProgressResponse> putProgress_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PutProgressRequest> request,
+  ) async {
+    return putProgress(call, await request);
+  }
+
+  $async.Future<$0.MarkAsWatchedResponse> markAsWatched_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.MarkAsWatchedRequest> request,
+  ) async {
+    return markAsWatched(call, await request);
+  }
+
+  $async.Future<$0.GetChatMessagesResponse> getChatMessages_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetChatMessagesRequest> request,
+  ) async {
+    return getChatMessages(call, await request);
+  }
+
+  $async.Future<$0.PostChatMessageResponse> postChatMessage_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PostChatMessageRequest> request,
+  ) async {
+    return postChatMessage(call, await request);
+  }
+
+  $async.Future<$0.PostChatReactionResponse> postChatReaction_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PostChatReactionRequest> request,
+  ) async {
+    return postChatReaction(call, await request);
+  }
+
+  $async.Future<$0.DeleteChatReactionResponse> deleteChatReaction_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.DeleteChatReactionRequest> request,
+  ) async {
+    return deleteChatReaction(call, await request);
+  }
+
+  $async.Future<$0.PostChatReplyResponse> postChatReply_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PostChatReplyRequest> request,
+  ) async {
+    return postChatReply(call, await request);
+  }
+
+  $async.Future<$0.MarkChatMessageAsResolvedResponse>
+      markChatMessageAsResolved_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.MarkChatMessageAsResolvedRequest> request,
+  ) async {
+    return markChatMessageAsResolved(call, await request);
+  }
+
+  $async.Future<$0.MarkChatMessageAsUnresolvedResponse>
+      markChatMessageAsUnresolved_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.MarkChatMessageAsUnresolvedRequest> request,
+  ) async {
+    return markChatMessageAsUnresolved(call, await request);
+  }
+
+  $async.Future<$0.GetPollsResponse> getPolls_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.GetPollsRequest> request,
+  ) async {
+    return getPolls(call, await request);
+  }
+
+  $async.Future<$0.PostPollVoteResponse> postPollVote_Pre(
+    $grpc.ServiceCall call,
+    $async.Future<$0.PostPollVoteRequest> request,
+  ) async {
+    return postPollVote(call, await request);
+  }
+
+  $async.Future<$0.GetUserResponse> getUser(
+    $grpc.ServiceCall call,
+    $0.GetUserRequest request,
+  );
+  $async.Future<$0.GetUserCoursesResponse> getUserCourses(
+    $grpc.ServiceCall call,
+    $0.GetUserCoursesRequest request,
+  );
+  $async.Future<$0.GetUserPinnedResponse> getUserPinned(
+    $grpc.ServiceCall call,
+    $0.GetUserPinnedRequest request,
+  );
+  $async.Future<$0.PostPinnedResponse> postUserPinned(
+    $grpc.ServiceCall call,
+    $0.PostPinnedRequest request,
+  );
+  $async.Future<$0.DeletePinnedResponse> deleteUserPinned(
+    $grpc.ServiceCall call,
+    $0.DeletePinnedRequest request,
+  );
+  $async.Future<$0.GetUserAdminResponse> getUserAdminCourses(
+    $grpc.ServiceCall call,
+    $0.GetUserAdminRequest request,
+  );
+  $async.Future<$0.GetUserSettingsResponse> getUserSettings(
+    $grpc.ServiceCall call,
+    $0.GetUserSettingsRequest request,
+  );
+  $async.Future<$0.PatchUserSettingsResponse> patchUserSettings(
+    $grpc.ServiceCall call,
+    $0.PatchUserSettingsRequest request,
+  );
+  $async.Future<$0.GetBookmarksResponse> getUserBookmarks(
+    $grpc.ServiceCall call,
+    $0.GetBookmarksRequest request,
+  );
+  $async.Future<$0.PutBookmarkResponse> putUserBookmark(
+    $grpc.ServiceCall call,
+    $0.PutBookmarkRequest request,
+  );
+  $async.Future<$0.PatchBookmarkResponse> patchUserBookmark(
+    $grpc.ServiceCall call,
+    $0.PatchBookmarkRequest request,
+  );
+  $async.Future<$0.DeleteBookmarkResponse> deleteUserBookmark(
+    $grpc.ServiceCall call,
+    $0.DeleteBookmarkRequest request,
+  );
+  $async.Future<$0.GetBannerAlertsResponse> getBannerAlerts(
+    $grpc.ServiceCall call,
+    $0.GetBannerAlertsRequest request,
+  );
+  $async.Future<$0.GetFeatureNotificationsResponse> getFeatureNotifications(
+    $grpc.ServiceCall call,
+    $0.GetFeatureNotificationsRequest request,
+  );
+  $async.Future<$0.PostDeviceTokenResponse> postDeviceToken(
+    $grpc.ServiceCall call,
+    $0.PostDeviceTokenRequest request,
+  );
+  $async.Future<$0.DeleteDeviceTokenResponse> deleteDeviceToken(
+    $grpc.ServiceCall call,
+    $0.DeleteDeviceTokenRequest request,
+  );
+  $async.Future<$0.GetPublicCoursesResponse> getPublicCourses(
+    $grpc.ServiceCall call,
+    $0.GetPublicCoursesRequest request,
+  );
+  $async.Future<$0.GetSemestersResponse> getSemesters(
+    $grpc.ServiceCall call,
+    $0.GetSemestersRequest request,
+  );
+  $async.Future<$0.GetCourseStreamsResponse> getCourseStreams(
+    $grpc.ServiceCall call,
+    $0.GetCourseStreamsRequest request,
+  );
+  $async.Future<$0.GetStreamResponse> getStream(
+    $grpc.ServiceCall call,
+    $0.GetStreamRequest request,
+  );
+  $async.Future<$0.GetNowLiveResponse> getNowLive(
+    $grpc.ServiceCall call,
+    $0.GetNowLiveRequest request,
+  );
+  $async.Future<$0.GetThumbsVODResponse> getThumbsVOD(
+    $grpc.ServiceCall call,
+    $0.GetThumbsVODRequest request,
+  );
+  $async.Future<$0.GetThumbsLiveResponse> getThumbsLive(
+    $grpc.ServiceCall call,
+    $0.GetThumbsLiveRequest request,
+  );
+  $async.Future<$0.GetProgressResponse> getProgress(
+    $grpc.ServiceCall call,
+    $0.GetProgressRequest request,
+  );
+  $async.Future<$0.PutProgressResponse> putProgress(
+    $grpc.ServiceCall call,
+    $0.PutProgressRequest request,
+  );
+  $async.Future<$0.MarkAsWatchedResponse> markAsWatched(
+    $grpc.ServiceCall call,
+    $0.MarkAsWatchedRequest request,
+  );
+  $async.Future<$0.GetChatMessagesResponse> getChatMessages(
+    $grpc.ServiceCall call,
+    $0.GetChatMessagesRequest request,
+  );
+  $async.Future<$0.PostChatMessageResponse> postChatMessage(
+    $grpc.ServiceCall call,
+    $0.PostChatMessageRequest request,
+  );
+  $async.Future<$0.PostChatReactionResponse> postChatReaction(
+    $grpc.ServiceCall call,
+    $0.PostChatReactionRequest request,
+  );
+  $async.Future<$0.DeleteChatReactionResponse> deleteChatReaction(
+    $grpc.ServiceCall call,
+    $0.DeleteChatReactionRequest request,
+  );
+  $async.Future<$0.PostChatReplyResponse> postChatReply(
+    $grpc.ServiceCall call,
+    $0.PostChatReplyRequest request,
+  );
+  $async.Future<$0.MarkChatMessageAsResolvedResponse> markChatMessageAsResolved(
+    $grpc.ServiceCall call,
+    $0.MarkChatMessageAsResolvedRequest request,
+  );
+  $async.Future<$0.MarkChatMessageAsUnresolvedResponse>
+      markChatMessageAsUnresolved(
+    $grpc.ServiceCall call,
+    $0.MarkChatMessageAsUnresolvedRequest request,
+  );
+  $async.Future<$0.GetPollsResponse> getPolls(
+    $grpc.ServiceCall call,
+    $0.GetPollsRequest request,
+  );
+  $async.Future<$0.PostPollVoteResponse> postPollVote(
+    $grpc.ServiceCall call,
+    $0.PostPollVoteRequest request,
+  );
 }
diff --git a/lib/base/networking/api/gocast/api_v2.pbjson.dart b/lib/base/networking/api/gocast/api_v2.pbjson.dart
index 9da66ff1..11118b19 100644
--- a/lib/base/networking/api/gocast/api_v2.pbjson.dart
+++ b/lib/base/networking/api/gocast/api_v2.pbjson.dart
@@ -28,6 +28,435 @@ final $typed_data.Uint8List userSettingTypeDescriptor = $convert.base64Decode(
     'Cg9Vc2VyU2V0dGluZ1R5cGUSEgoOUFJFRkVSUkVEX05BTUUQABIMCghHUkVFVElORxABEhoKFk'
     'NVU1RPTV9QTEFZQkFDS19TUEVFRFMQAg==');
 
+@$core.Deprecated('Use chatReactionDescriptor instead')
+const ChatReaction$json = {
+  '1': 'ChatReaction',
+  '2': [
+    {'1': 'chatID', '3': 1, '4': 1, '5': 13, '10': 'chatID'},
+    {'1': 'userID', '3': 2, '4': 1, '5': 13, '10': 'userID'},
+    {'1': 'username', '3': 3, '4': 1, '5': 9, '10': 'username'},
+    {'1': 'emoji', '3': 4, '4': 1, '5': 9, '10': 'emoji'},
+  ],
+};
+
+/// Descriptor for `ChatReaction`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List chatReactionDescriptor = $convert.base64Decode(
+    'CgxDaGF0UmVhY3Rpb24SFgoGY2hhdElEGAEgASgNUgZjaGF0SUQSFgoGdXNlcklEGAIgASgNUg'
+    'Z1c2VySUQSGgoIdXNlcm5hbWUYAyABKAlSCHVzZXJuYW1lEhQKBWVtb2ppGAQgASgJUgVlbW9q'
+    'aQ==');
+
+@$core.Deprecated('Use addressedUserDescriptor instead')
+const AddressedUser$json = {
+  '1': 'AddressedUser',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
+    {'1': 'username', '3': 2, '4': 1, '5': 9, '10': 'username'},
+  ],
+};
+
+/// Descriptor for `AddressedUser`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List addressedUserDescriptor = $convert.base64Decode(
+    'Cg1BZGRyZXNzZWRVc2VyEg4KAmlkGAEgASgNUgJpZBIaCgh1c2VybmFtZRgCIAEoCVIIdXNlcm'
+    '5hbWU=');
+
+@$core.Deprecated('Use chatMessageDescriptor instead')
+const ChatMessage$json = {
+  '1': 'ChatMessage',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
+    {'1': 'userID', '3': 2, '4': 1, '5': 9, '10': 'userID'},
+    {'1': 'username', '3': 3, '4': 1, '5': 9, '10': 'username'},
+    {'1': 'message', '3': 4, '4': 1, '5': 9, '10': 'message'},
+    {'1': 'sanitizedMessage', '3': 5, '4': 1, '5': 9, '10': 'sanitizedMessage'},
+    {'1': 'streamID', '3': 6, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'color', '3': 7, '4': 1, '5': 9, '10': 'color'},
+    {'1': 'isVisible', '3': 8, '4': 1, '5': 8, '10': 'isVisible'},
+    {
+      '1': 'reactions',
+      '3': 9,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.ChatReaction',
+      '10': 'reactions',
+    },
+    {
+      '1': 'replies',
+      '3': 10,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.ChatMessage',
+      '10': 'replies',
+    },
+    {
+      '1': 'addressedUsers',
+      '3': 11,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.AddressedUser',
+      '10': 'addressedUsers',
+    },
+    {'1': 'isResolved', '3': 12, '4': 1, '5': 8, '10': 'isResolved'},
+    {
+      '1': 'createdAt',
+      '3': 13,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Timestamp',
+      '10': 'createdAt',
+    },
+    {'1': 'isAdmin', '3': 14, '4': 1, '5': 8, '10': 'isAdmin'},
+  ],
+};
+
+/// Descriptor for `ChatMessage`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List chatMessageDescriptor = $convert.base64Decode(
+    'CgtDaGF0TWVzc2FnZRIOCgJpZBgBIAEoDVICaWQSFgoGdXNlcklEGAIgASgJUgZ1c2VySUQSGg'
+    'oIdXNlcm5hbWUYAyABKAlSCHVzZXJuYW1lEhgKB21lc3NhZ2UYBCABKAlSB21lc3NhZ2USKgoQ'
+    'c2FuaXRpemVkTWVzc2FnZRgFIAEoCVIQc2FuaXRpemVkTWVzc2FnZRIaCghzdHJlYW1JRBgGIA'
+    'EoDVIIc3RyZWFtSUQSFAoFY29sb3IYByABKAlSBWNvbG9yEhwKCWlzVmlzaWJsZRgIIAEoCFIJ'
+    'aXNWaXNpYmxlEjQKCXJlYWN0aW9ucxgJIAMoCzIWLnByb3RvYnVmLkNoYXRSZWFjdGlvblIJcm'
+    'VhY3Rpb25zEi8KB3JlcGxpZXMYCiADKAsyFS5wcm90b2J1Zi5DaGF0TWVzc2FnZVIHcmVwbGll'
+    'cxI/Cg5hZGRyZXNzZWRVc2VycxgLIAMoCzIXLnByb3RvYnVmLkFkZHJlc3NlZFVzZXJSDmFkZH'
+    'Jlc3NlZFVzZXJzEh4KCmlzUmVzb2x2ZWQYDCABKAhSCmlzUmVzb2x2ZWQSOAoJY3JlYXRlZEF0'
+    'GA0gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcFIJY3JlYXRlZEF0EhgKB2lzQWRtaW'
+    '4YDiABKAhSB2lzQWRtaW4=');
+
+@$core.Deprecated('Use getChatMessagesRequestDescriptor instead')
+const GetChatMessagesRequest$json = {
+  '1': 'GetChatMessagesRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `GetChatMessagesRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getChatMessagesRequestDescriptor =
+    $convert.base64Decode(
+  'ChZHZXRDaGF0TWVzc2FnZXNSZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUghzdHJlYW1JRA==',
+);
+
+@$core.Deprecated('Use postChatMessageRequestDescriptor instead')
+const PostChatMessageRequest$json = {
+  '1': 'PostChatMessageRequest',
+  '2': [
+    {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'},
+    {'1': 'streamID', '3': 2, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `PostChatMessageRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postChatMessageRequestDescriptor =
+    $convert.base64Decode(
+        'ChZQb3N0Q2hhdE1lc3NhZ2VSZXF1ZXN0EhgKB21lc3NhZ2UYASABKAlSB21lc3NhZ2USGgoIc3'
+        'RyZWFtSUQYAiABKA1SCHN0cmVhbUlE');
+
+@$core.Deprecated('Use postChatReactionRequestDescriptor instead')
+const PostChatReactionRequest$json = {
+  '1': 'PostChatReactionRequest',
+  '2': [
+    {'1': 'emoji', '3': 1, '4': 1, '5': 9, '10': 'emoji'},
+    {'1': 'streamID', '3': 2, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'chatID', '3': 3, '4': 1, '5': 13, '10': 'chatID'},
+  ],
+};
+
+/// Descriptor for `PostChatReactionRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postChatReactionRequestDescriptor =
+    $convert.base64Decode(
+        'ChdQb3N0Q2hhdFJlYWN0aW9uUmVxdWVzdBIUCgVlbW9qaRgBIAEoCVIFZW1vamkSGgoIc3RyZW'
+        'FtSUQYAiABKA1SCHN0cmVhbUlEEhYKBmNoYXRJRBgDIAEoDVIGY2hhdElE');
+
+@$core.Deprecated('Use deleteChatReactionRequestDescriptor instead')
+const DeleteChatReactionRequest$json = {
+  '1': 'DeleteChatReactionRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'chatID', '3': 2, '4': 1, '5': 13, '10': 'chatID'},
+    {'1': 'reactionID', '3': 3, '4': 1, '5': 13, '10': 'reactionID'},
+  ],
+};
+
+/// Descriptor for `DeleteChatReactionRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteChatReactionRequestDescriptor = $convert.base64Decode(
+    'ChlEZWxldGVDaGF0UmVhY3Rpb25SZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUghzdHJlYW1JRB'
+    'IWCgZjaGF0SUQYAiABKA1SBmNoYXRJRBIeCgpyZWFjdGlvbklEGAMgASgNUgpyZWFjdGlvbklE');
+
+@$core.Deprecated('Use postChatReplyRequestDescriptor instead')
+const PostChatReplyRequest$json = {
+  '1': 'PostChatReplyRequest',
+  '2': [
+    {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'},
+    {'1': 'streamID', '3': 2, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'chatID', '3': 3, '4': 1, '5': 13, '10': 'chatID'},
+  ],
+};
+
+/// Descriptor for `PostChatReplyRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postChatReplyRequestDescriptor = $convert.base64Decode(
+    'ChRQb3N0Q2hhdFJlcGx5UmVxdWVzdBIYCgdtZXNzYWdlGAEgASgJUgdtZXNzYWdlEhoKCHN0cm'
+    'VhbUlEGAIgASgNUghzdHJlYW1JRBIWCgZjaGF0SUQYAyABKA1SBmNoYXRJRA==');
+
+@$core.Deprecated('Use markChatMessageAsResolvedRequestDescriptor instead')
+const MarkChatMessageAsResolvedRequest$json = {
+  '1': 'MarkChatMessageAsResolvedRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'chatID', '3': 2, '4': 1, '5': 13, '10': 'chatID'},
+  ],
+};
+
+/// Descriptor for `MarkChatMessageAsResolvedRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List markChatMessageAsResolvedRequestDescriptor =
+    $convert.base64Decode(
+        'CiBNYXJrQ2hhdE1lc3NhZ2VBc1Jlc29sdmVkUmVxdWVzdBIaCghzdHJlYW1JRBgBIAEoDVIIc3'
+        'RyZWFtSUQSFgoGY2hhdElEGAIgASgNUgZjaGF0SUQ=');
+
+@$core.Deprecated('Use markChatMessageAsUnresolvedRequestDescriptor instead')
+const MarkChatMessageAsUnresolvedRequest$json = {
+  '1': 'MarkChatMessageAsUnresolvedRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'chatID', '3': 2, '4': 1, '5': 13, '10': 'chatID'},
+  ],
+};
+
+/// Descriptor for `MarkChatMessageAsUnresolvedRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List markChatMessageAsUnresolvedRequestDescriptor =
+    $convert.base64Decode(
+        'CiJNYXJrQ2hhdE1lc3NhZ2VBc1VucmVzb2x2ZWRSZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUg'
+        'hzdHJlYW1JRBIWCgZjaGF0SUQYAiABKA1SBmNoYXRJRA==');
+
+@$core.Deprecated('Use getChatMessagesResponseDescriptor instead')
+const GetChatMessagesResponse$json = {
+  '1': 'GetChatMessagesResponse',
+  '2': [
+    {
+      '1': 'messages',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.ChatMessage',
+      '10': 'messages',
+    },
+  ],
+};
+
+/// Descriptor for `GetChatMessagesResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getChatMessagesResponseDescriptor =
+    $convert.base64Decode(
+        'ChdHZXRDaGF0TWVzc2FnZXNSZXNwb25zZRIxCghtZXNzYWdlcxgBIAMoCzIVLnByb3RvYnVmLk'
+        'NoYXRNZXNzYWdlUghtZXNzYWdlcw==');
+
+@$core.Deprecated('Use postChatMessageResponseDescriptor instead')
+const PostChatMessageResponse$json = {
+  '1': 'PostChatMessageResponse',
+  '2': [
+    {
+      '1': 'message',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.ChatMessage',
+      '10': 'message',
+    },
+  ],
+};
+
+/// Descriptor for `PostChatMessageResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postChatMessageResponseDescriptor =
+    $convert.base64Decode(
+        'ChdQb3N0Q2hhdE1lc3NhZ2VSZXNwb25zZRIvCgdtZXNzYWdlGAEgASgLMhUucHJvdG9idWYuQ2'
+        'hhdE1lc3NhZ2VSB21lc3NhZ2U=');
+
+@$core.Deprecated('Use postChatReactionResponseDescriptor instead')
+const PostChatReactionResponse$json = {
+  '1': 'PostChatReactionResponse',
+  '2': [
+    {
+      '1': 'reaction',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.ChatReaction',
+      '10': 'reaction',
+    },
+  ],
+};
+
+/// Descriptor for `PostChatReactionResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postChatReactionResponseDescriptor =
+    $convert.base64Decode(
+        'ChhQb3N0Q2hhdFJlYWN0aW9uUmVzcG9uc2USMgoIcmVhY3Rpb24YASABKAsyFi5wcm90b2J1Zi'
+        '5DaGF0UmVhY3Rpb25SCHJlYWN0aW9u');
+
+@$core.Deprecated('Use deleteChatReactionResponseDescriptor instead')
+const DeleteChatReactionResponse$json = {
+  '1': 'DeleteChatReactionResponse',
+};
+
+/// Descriptor for `DeleteChatReactionResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteChatReactionResponseDescriptor =
+    $convert.base64Decode('ChpEZWxldGVDaGF0UmVhY3Rpb25SZXNwb25zZQ==');
+
+@$core.Deprecated('Use postChatReplyResponseDescriptor instead')
+const PostChatReplyResponse$json = {
+  '1': 'PostChatReplyResponse',
+  '2': [
+    {
+      '1': 'reply',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.ChatMessage',
+      '10': 'reply',
+    },
+  ],
+};
+
+/// Descriptor for `PostChatReplyResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postChatReplyResponseDescriptor = $convert.base64Decode(
+    'ChVQb3N0Q2hhdFJlcGx5UmVzcG9uc2USKwoFcmVwbHkYASABKAsyFS5wcm90b2J1Zi5DaGF0TW'
+    'Vzc2FnZVIFcmVwbHk=');
+
+@$core.Deprecated('Use markChatMessageAsResolvedResponseDescriptor instead')
+const MarkChatMessageAsResolvedResponse$json = {
+  '1': 'MarkChatMessageAsResolvedResponse',
+  '2': [
+    {
+      '1': 'message',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.ChatMessage',
+      '10': 'message',
+    },
+  ],
+};
+
+/// Descriptor for `MarkChatMessageAsResolvedResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List markChatMessageAsResolvedResponseDescriptor =
+    $convert.base64Decode(
+        'CiFNYXJrQ2hhdE1lc3NhZ2VBc1Jlc29sdmVkUmVzcG9uc2USLwoHbWVzc2FnZRgBIAEoCzIVLn'
+        'Byb3RvYnVmLkNoYXRNZXNzYWdlUgdtZXNzYWdl');
+
+@$core.Deprecated('Use markChatMessageAsUnresolvedResponseDescriptor instead')
+const MarkChatMessageAsUnresolvedResponse$json = {
+  '1': 'MarkChatMessageAsUnresolvedResponse',
+  '2': [
+    {
+      '1': 'message',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.ChatMessage',
+      '10': 'message',
+    },
+  ],
+};
+
+/// Descriptor for `MarkChatMessageAsUnresolvedResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List markChatMessageAsUnresolvedResponseDescriptor =
+    $convert.base64Decode(
+        'CiNNYXJrQ2hhdE1lc3NhZ2VBc1VucmVzb2x2ZWRSZXNwb25zZRIvCgdtZXNzYWdlGAEgASgLMh'
+        'UucHJvdG9idWYuQ2hhdE1lc3NhZ2VSB21lc3NhZ2U=');
+
+@$core.Deprecated('Use pollDescriptor instead')
+const Poll$json = {
+  '1': 'Poll',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
+    {'1': 'streamID', '3': 2, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'question', '3': 3, '4': 1, '5': 9, '10': 'question'},
+    {'1': 'active', '3': 4, '4': 1, '5': 8, '10': 'active'},
+    {
+      '1': 'pollOptions',
+      '3': 5,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.PollOption',
+      '10': 'pollOptions',
+    },
+  ],
+};
+
+/// Descriptor for `Poll`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List pollDescriptor = $convert.base64Decode(
+    'CgRQb2xsEg4KAmlkGAEgASgNUgJpZBIaCghzdHJlYW1JRBgCIAEoDVIIc3RyZWFtSUQSGgoIcX'
+    'Vlc3Rpb24YAyABKAlSCHF1ZXN0aW9uEhYKBmFjdGl2ZRgEIAEoCFIGYWN0aXZlEjYKC3BvbGxP'
+    'cHRpb25zGAUgAygLMhQucHJvdG9idWYuUG9sbE9wdGlvblILcG9sbE9wdGlvbnM=');
+
+@$core.Deprecated('Use pollOptionDescriptor instead')
+const PollOption$json = {
+  '1': 'PollOption',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
+    {'1': 'answer', '3': 2, '4': 1, '5': 9, '10': 'answer'},
+    {'1': 'votes', '3': 3, '4': 1, '5': 13, '10': 'votes'},
+    {'1': 'voted', '3': 4, '4': 1, '5': 8, '10': 'voted'},
+  ],
+};
+
+/// Descriptor for `PollOption`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List pollOptionDescriptor = $convert.base64Decode(
+    'CgpQb2xsT3B0aW9uEg4KAmlkGAEgASgNUgJpZBIWCgZhbnN3ZXIYAiABKAlSBmFuc3dlchIUCg'
+    'V2b3RlcxgDIAEoDVIFdm90ZXMSFAoFdm90ZWQYBCABKAhSBXZvdGVk');
+
+@$core.Deprecated('Use getPollsRequestDescriptor instead')
+const GetPollsRequest$json = {
+  '1': 'GetPollsRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `GetPollsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getPollsRequestDescriptor = $convert.base64Decode(
+  'Cg9HZXRQb2xsc1JlcXVlc3QSGgoIc3RyZWFtSUQYASABKA1SCHN0cmVhbUlE',
+);
+
+@$core.Deprecated('Use postPollVoteRequestDescriptor instead')
+const PostPollVoteRequest$json = {
+  '1': 'PostPollVoteRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+    {'1': 'pollOptionID', '3': 2, '4': 1, '5': 13, '10': 'pollOptionID'},
+  ],
+};
+
+/// Descriptor for `PostPollVoteRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postPollVoteRequestDescriptor = $convert.base64Decode(
+    'ChNQb3N0UG9sbFZvdGVSZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUghzdHJlYW1JRBIiCgxwb2'
+    'xsT3B0aW9uSUQYAiABKA1SDHBvbGxPcHRpb25JRA==');
+
+@$core.Deprecated('Use getPollsResponseDescriptor instead')
+const GetPollsResponse$json = {
+  '1': 'GetPollsResponse',
+  '2': [
+    {
+      '1': 'polls',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Poll',
+      '10': 'polls',
+    },
+  ],
+};
+
+/// Descriptor for `GetPollsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getPollsResponseDescriptor = $convert.base64Decode(
+    'ChBHZXRQb2xsc1Jlc3BvbnNlEiQKBXBvbGxzGAEgAygLMg4ucHJvdG9idWYuUG9sbFIFcG9sbH'
+    'M=');
+
+@$core.Deprecated('Use postPollVoteResponseDescriptor instead')
+const PostPollVoteResponse$json = {
+  '1': 'PostPollVoteResponse',
+};
+
+/// Descriptor for `PostPollVoteResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postPollVoteResponseDescriptor =
+    $convert.base64Decode('ChRQb3N0UG9sbFZvdGVSZXNwb25zZQ==');
+
 @$core.Deprecated('Use userDescriptor instead')
 const User$json = {
   '1': 'User',
@@ -36,14 +465,55 @@ const User$json = {
     {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
     {'1': 'lastName', '3': 3, '4': 1, '5': 9, '10': 'lastName'},
     {'1': 'email', '3': 4, '4': 1, '5': 9, '10': 'email'},
-    {'1': 'matriculationNumber', '3': 5, '4': 1, '5': 9, '10': 'matriculationNumber'},
+    {
+      '1': 'matriculationNumber',
+      '3': 5,
+      '4': 1,
+      '5': 9,
+      '10': 'matriculationNumber',
+    },
     {'1': 'lrzID', '3': 6, '4': 1, '5': 9, '10': 'lrzID'},
     {'1': 'role', '3': 7, '4': 1, '5': 13, '10': 'role'},
-    {'1': 'courses', '3': 8, '4': 3, '5': 11, '6': '.protobuf.Course', '10': 'courses'},
-    {'1': 'administeredCourses', '3': 9, '4': 3, '5': 11, '6': '.protobuf.Course', '10': 'administeredCourses'},
-    {'1': 'pinnedCourses', '3': 10, '4': 3, '5': 11, '6': '.protobuf.Course', '10': 'pinnedCourses'},
-    {'1': 'settings', '3': 11, '4': 3, '5': 11, '6': '.protobuf.UserSetting', '10': 'settings'},
-    {'1': 'bookmarks', '3': 12, '4': 3, '5': 11, '6': '.protobuf.Bookmark', '10': 'bookmarks'},
+    {
+      '1': 'courses',
+      '3': 8,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'courses',
+    },
+    {
+      '1': 'administeredCourses',
+      '3': 9,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'administeredCourses',
+    },
+    {
+      '1': 'pinnedCourses',
+      '3': 10,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'pinnedCourses',
+    },
+    {
+      '1': 'settings',
+      '3': 11,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.UserSetting',
+      '10': 'settings',
+    },
+    {
+      '1': 'bookmarks',
+      '3': 12,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Bookmark',
+      '10': 'bookmarks',
+    },
   ],
 };
 
@@ -63,18 +533,22 @@ final $typed_data.Uint8List userDescriptor = $convert.base64Decode(
 const UserSetting$json = {
   '1': 'UserSetting',
   '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
-    {'1': 'userID', '3': 2, '4': 1, '5': 13, '10': 'userID'},
-    {'1': 'type', '3': 3, '4': 1, '5': 14, '6': '.protobuf.UserSettingType', '10': 'type'},
+    {
+      '1': 'type',
+      '3': 3,
+      '4': 1,
+      '5': 14,
+      '6': '.protobuf.UserSettingType',
+      '10': 'type',
+    },
     {'1': 'value', '3': 4, '4': 1, '5': 9, '10': 'value'},
   ],
 };
 
 /// Descriptor for `UserSetting`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List userSettingDescriptor = $convert.base64Decode(
-    'CgtVc2VyU2V0dGluZxIOCgJpZBgBIAEoDVICaWQSFgoGdXNlcklEGAIgASgNUgZ1c2VySUQSLQ'
-    'oEdHlwZRgDIAEoDjIZLnByb3RvYnVmLlVzZXJTZXR0aW5nVHlwZVIEdHlwZRIUCgV2YWx1ZRgE'
-    'IAEoCVIFdmFsdWU=');
+    'CgtVc2VyU2V0dGluZxItCgR0eXBlGAMgASgOMhkucHJvdG9idWYuVXNlclNldHRpbmdUeXBlUg'
+    'R0eXBlEhQKBXZhbHVlGAQgASgJUgV2YWx1ZQ==');
 
 @$core.Deprecated('Use getUserRequestDescriptor instead')
 const GetUserRequest$json = {
@@ -82,43 +556,40 @@ const GetUserRequest$json = {
 };
 
 /// Descriptor for `GetUserRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getUserRequestDescriptor = $convert.base64Decode(
-    'Cg5HZXRVc2VyUmVxdWVzdA==',
-);
+final $typed_data.Uint8List getUserRequestDescriptor =
+    $convert.base64Decode('Cg5HZXRVc2VyUmVxdWVzdA==');
 
 @$core.Deprecated('Use getUserCoursesRequestDescriptor instead')
 const GetUserCoursesRequest$json = {
   '1': 'GetUserCoursesRequest',
   '2': [
-    {'1': 'year', '3': 1, '4': 1, '5': 5, '10': 'year'},
+    {'1': 'year', '3': 1, '4': 1, '5': 13, '10': 'year'},
     {'1': 'term', '3': 2, '4': 1, '5': 9, '10': 'term'},
-    {'1': 'query', '3': 3, '4': 1, '5': 9, '10': 'query'},
-    {'1': 'limit', '3': 4, '4': 1, '5': 5, '10': 'limit'},
-    {'1': 'skip', '3': 5, '4': 1, '5': 5, '10': 'skip'},
+    {'1': 'limit', '3': 3, '4': 1, '5': 13, '10': 'limit'},
+    {'1': 'skip', '3': 4, '4': 1, '5': 13, '10': 'skip'},
   ],
 };
 
 /// Descriptor for `GetUserCoursesRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getUserCoursesRequestDescriptor = $convert.base64Decode(
-    'ChVHZXRVc2VyQ291cnNlc1JlcXVlc3QSEgoEeWVhchgBIAEoBVIEeWVhchISCgR0ZXJtGAIgAS'
-    'gJUgR0ZXJtEhQKBXF1ZXJ5GAMgASgJUgVxdWVyeRIUCgVsaW1pdBgEIAEoBVIFbGltaXQSEgoE'
-    'c2tpcBgFIAEoBVIEc2tpcA==');
+    'ChVHZXRVc2VyQ291cnNlc1JlcXVlc3QSEgoEeWVhchgBIAEoDVIEeWVhchISCgR0ZXJtGAIgAS'
+    'gJUgR0ZXJtEhQKBWxpbWl0GAMgASgNUgVsaW1pdBISCgRza2lwGAQgASgNUgRza2lw');
 
 @$core.Deprecated('Use getUserPinnedRequestDescriptor instead')
 const GetUserPinnedRequest$json = {
   '1': 'GetUserPinnedRequest',
   '2': [
-    {'1': 'year', '3': 1, '4': 1, '5': 5, '10': 'year'},
+    {'1': 'year', '3': 1, '4': 1, '5': 13, '10': 'year'},
     {'1': 'term', '3': 2, '4': 1, '5': 9, '10': 'term'},
-    {'1': 'limit', '3': 3, '4': 1, '5': 5, '10': 'limit'},
-    {'1': 'skip', '3': 4, '4': 1, '5': 5, '10': 'skip'},
+    {'1': 'limit', '3': 3, '4': 1, '5': 13, '10': 'limit'},
+    {'1': 'skip', '3': 4, '4': 1, '5': 13, '10': 'skip'},
   ],
 };
 
 /// Descriptor for `GetUserPinnedRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getUserPinnedRequestDescriptor = $convert.base64Decode(
-    'ChRHZXRVc2VyUGlubmVkUmVxdWVzdBISCgR5ZWFyGAEgASgFUgR5ZWFyEhIKBHRlcm0YAiABKA'
-    'lSBHRlcm0SFAoFbGltaXQYAyABKAVSBWxpbWl0EhIKBHNraXAYBCABKAVSBHNraXA=');
+    'ChRHZXRVc2VyUGlubmVkUmVxdWVzdBISCgR5ZWFyGAEgASgNUgR5ZWFyEhIKBHRlcm0YAiABKA'
+    'lSBHRlcm0SFAoFbGltaXQYAyABKA1SBWxpbWl0EhIKBHNraXAYBCABKA1SBHNraXA=');
 
 @$core.Deprecated('Use getUserAdminRequestDescriptor instead')
 const GetUserAdminRequest$json = {
@@ -126,9 +597,8 @@ const GetUserAdminRequest$json = {
 };
 
 /// Descriptor for `GetUserAdminRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getUserAdminRequestDescriptor = $convert.base64Decode(
-    'ChNHZXRVc2VyQWRtaW5SZXF1ZXN0',
-);
+final $typed_data.Uint8List getUserAdminRequestDescriptor =
+    $convert.base64Decode('ChNHZXRVc2VyQWRtaW5SZXF1ZXN0');
 
 @$core.Deprecated('Use getUserSettingsRequestDescriptor instead')
 const GetUserSettingsRequest$json = {
@@ -136,8 +606,76 @@ const GetUserSettingsRequest$json = {
 };
 
 /// Descriptor for `GetUserSettingsRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getUserSettingsRequestDescriptor = $convert.base64Decode(
-    'ChZHZXRVc2VyU2V0dGluZ3NSZXF1ZXN0',
+final $typed_data.Uint8List getUserSettingsRequestDescriptor =
+    $convert.base64Decode('ChZHZXRVc2VyU2V0dGluZ3NSZXF1ZXN0');
+
+@$core.Deprecated('Use patchUserSettingsRequestDescriptor instead')
+const PatchUserSettingsRequest$json = {
+  '1': 'PatchUserSettingsRequest',
+  '2': [
+    {
+      '1': 'userSettings',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.UserSetting',
+      '10': 'userSettings',
+    },
+  ],
+};
+
+/// Descriptor for `PatchUserSettingsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List patchUserSettingsRequestDescriptor =
+    $convert.base64Decode(
+        'ChhQYXRjaFVzZXJTZXR0aW5nc1JlcXVlc3QSOQoMdXNlclNldHRpbmdzGAEgAygLMhUucHJvdG'
+        '9idWYuVXNlclNldHRpbmdSDHVzZXJTZXR0aW5ncw==');
+
+@$core.Deprecated('Use patchUserSettingsResponseDescriptor instead')
+const PatchUserSettingsResponse$json = {
+  '1': 'PatchUserSettingsResponse',
+  '2': [
+    {
+      '1': 'userSettings',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.UserSetting',
+      '10': 'userSettings',
+    },
+  ],
+};
+
+/// Descriptor for `PatchUserSettingsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List patchUserSettingsResponseDescriptor =
+    $convert.base64Decode(
+        'ChlQYXRjaFVzZXJTZXR0aW5nc1Jlc3BvbnNlEjkKDHVzZXJTZXR0aW5ncxgBIAMoCzIVLnByb3'
+        'RvYnVmLlVzZXJTZXR0aW5nUgx1c2VyU2V0dGluZ3M=');
+
+@$core.Deprecated('Use postPinnedRequestDescriptor instead')
+const PostPinnedRequest$json = {
+  '1': 'PostPinnedRequest',
+  '2': [
+    {'1': 'courseID', '3': 1, '4': 1, '5': 13, '10': 'courseID'},
+  ],
+};
+
+/// Descriptor for `PostPinnedRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postPinnedRequestDescriptor = $convert.base64Decode(
+  'ChFQb3N0UGlubmVkUmVxdWVzdBIaCghjb3Vyc2VJRBgBIAEoDVIIY291cnNlSUQ=',
+);
+
+@$core.Deprecated('Use deletePinnedRequestDescriptor instead')
+const DeletePinnedRequest$json = {
+  '1': 'DeletePinnedRequest',
+  '2': [
+    {'1': 'courseID', '3': 1, '4': 1, '5': 13, '10': 'courseID'},
+  ],
+};
+
+/// Descriptor for `DeletePinnedRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deletePinnedRequestDescriptor =
+    $convert.base64Decode(
+  'ChNEZWxldGVQaW5uZWRSZXF1ZXN0EhoKCGNvdXJzZUlEGAEgASgNUghjb3Vyc2VJRA==',
 );
 
 @$core.Deprecated('Use getUserResponseDescriptor instead')
@@ -150,27 +688,42 @@ const GetUserResponse$json = {
 
 /// Descriptor for `GetUserResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getUserResponseDescriptor = $convert.base64Decode(
-    'Cg9HZXRVc2VyUmVzcG9uc2USIgoEdXNlchgBIAEoCzIOLnByb3RvYnVmLlVzZXJSBHVzZXI=',
+  'Cg9HZXRVc2VyUmVzcG9uc2USIgoEdXNlchgBIAEoCzIOLnByb3RvYnVmLlVzZXJSBHVzZXI=',
 );
 
 @$core.Deprecated('Use getUserCoursesResponseDescriptor instead')
 const GetUserCoursesResponse$json = {
   '1': 'GetUserCoursesResponse',
   '2': [
-    {'1': 'courses', '3': 1, '4': 3, '5': 11, '6': '.protobuf.Course', '10': 'courses'},
+    {
+      '1': 'courses',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'courses',
+    },
   ],
 };
 
 /// Descriptor for `GetUserCoursesResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getUserCoursesResponseDescriptor = $convert.base64Decode(
-    'ChZHZXRVc2VyQ291cnNlc1Jlc3BvbnNlEioKB2NvdXJzZXMYASADKAsyEC5wcm90b2J1Zi5Db3'
-    'Vyc2VSB2NvdXJzZXM=');
+final $typed_data.Uint8List getUserCoursesResponseDescriptor =
+    $convert.base64Decode(
+        'ChZHZXRVc2VyQ291cnNlc1Jlc3BvbnNlEioKB2NvdXJzZXMYASADKAsyEC5wcm90b2J1Zi5Db3'
+        'Vyc2VSB2NvdXJzZXM=');
 
 @$core.Deprecated('Use getUserPinnedResponseDescriptor instead')
 const GetUserPinnedResponse$json = {
   '1': 'GetUserPinnedResponse',
   '2': [
-    {'1': 'courses', '3': 1, '4': 3, '5': 11, '6': '.protobuf.Course', '10': 'courses'},
+    {
+      '1': 'courses',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'courses',
+    },
   ],
 };
 
@@ -183,7 +736,14 @@ final $typed_data.Uint8List getUserPinnedResponseDescriptor = $convert.base64Dec
 const GetUserAdminResponse$json = {
   '1': 'GetUserAdminResponse',
   '2': [
-    {'1': 'courses', '3': 1, '4': 3, '5': 11, '6': '.protobuf.Course', '10': 'courses'},
+    {
+      '1': 'courses',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'courses',
+    },
   ],
 };
 
@@ -196,14 +756,40 @@ final $typed_data.Uint8List getUserAdminResponseDescriptor = $convert.base64Deco
 const GetUserSettingsResponse$json = {
   '1': 'GetUserSettingsResponse',
   '2': [
-    {'1': 'userSettings', '3': 1, '4': 3, '5': 11, '6': '.protobuf.UserSetting', '10': 'userSettings'},
+    {
+      '1': 'userSettings',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.UserSetting',
+      '10': 'userSettings',
+    },
   ],
 };
 
 /// Descriptor for `GetUserSettingsResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getUserSettingsResponseDescriptor = $convert.base64Decode(
-    'ChdHZXRVc2VyU2V0dGluZ3NSZXNwb25zZRI5Cgx1c2VyU2V0dGluZ3MYASADKAsyFS5wcm90b2'
-    'J1Zi5Vc2VyU2V0dGluZ1IMdXNlclNldHRpbmdz');
+final $typed_data.Uint8List getUserSettingsResponseDescriptor =
+    $convert.base64Decode(
+        'ChdHZXRVc2VyU2V0dGluZ3NSZXNwb25zZRI5Cgx1c2VyU2V0dGluZ3MYASADKAsyFS5wcm90b2'
+        'J1Zi5Vc2VyU2V0dGluZ1IMdXNlclNldHRpbmdz');
+
+@$core.Deprecated('Use postPinnedResponseDescriptor instead')
+const PostPinnedResponse$json = {
+  '1': 'PostPinnedResponse',
+};
+
+/// Descriptor for `PostPinnedResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postPinnedResponseDescriptor =
+    $convert.base64Decode('ChJQb3N0UGlubmVkUmVzcG9uc2U=');
+
+@$core.Deprecated('Use deletePinnedResponseDescriptor instead')
+const DeletePinnedResponse$json = {
+  '1': 'DeletePinnedResponse',
+};
+
+/// Descriptor for `DeletePinnedResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deletePinnedResponseDescriptor =
+    $convert.base64Decode('ChREZWxldGVQaW5uZWRSZXNwb25zZQ==');
 
 @$core.Deprecated('Use bookmarkDescriptor instead')
 const Bookmark$json = {
@@ -230,20 +816,77 @@ final $typed_data.Uint8List bookmarkDescriptor = $convert.base64Decode(
 const GetBookmarksRequest$json = {
   '1': 'GetBookmarksRequest',
   '2': [
-    {'1': 'streamID', '3': 1, '4': 1, '5': 5, '10': 'streamID'},
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
   ],
 };
 
 /// Descriptor for `GetBookmarksRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getBookmarksRequestDescriptor = $convert.base64Decode(
-    'ChNHZXRCb29rbWFya3NSZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgFUghzdHJlYW1JRA==',
+final $typed_data.Uint8List getBookmarksRequestDescriptor =
+    $convert.base64Decode(
+  'ChNHZXRCb29rbWFya3NSZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUghzdHJlYW1JRA==',
 );
 
+@$core.Deprecated('Use putBookmarkRequestDescriptor instead')
+const PutBookmarkRequest$json = {
+  '1': 'PutBookmarkRequest',
+  '2': [
+    {'1': 'description', '3': 1, '4': 1, '5': 9, '10': 'description'},
+    {'1': 'hours', '3': 2, '4': 1, '5': 13, '10': 'hours'},
+    {'1': 'minutes', '3': 3, '4': 1, '5': 13, '10': 'minutes'},
+    {'1': 'seconds', '3': 4, '4': 1, '5': 13, '10': 'seconds'},
+    {'1': 'streamID', '3': 5, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `PutBookmarkRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List putBookmarkRequestDescriptor = $convert.base64Decode(
+    'ChJQdXRCb29rbWFya1JlcXVlc3QSIAoLZGVzY3JpcHRpb24YASABKAlSC2Rlc2NyaXB0aW9uEh'
+    'QKBWhvdXJzGAIgASgNUgVob3VycxIYCgdtaW51dGVzGAMgASgNUgdtaW51dGVzEhgKB3NlY29u'
+    'ZHMYBCABKA1SB3NlY29uZHMSGgoIc3RyZWFtSUQYBSABKA1SCHN0cmVhbUlE');
+
+@$core.Deprecated('Use patchBookmarkRequestDescriptor instead')
+const PatchBookmarkRequest$json = {
+  '1': 'PatchBookmarkRequest',
+  '2': [
+    {'1': 'description', '3': 1, '4': 1, '5': 9, '10': 'description'},
+    {'1': 'hours', '3': 2, '4': 1, '5': 13, '10': 'hours'},
+    {'1': 'minutes', '3': 3, '4': 1, '5': 13, '10': 'minutes'},
+    {'1': 'seconds', '3': 4, '4': 1, '5': 13, '10': 'seconds'},
+    {'1': 'bookmarkID', '3': 5, '4': 1, '5': 13, '10': 'bookmarkID'},
+  ],
+};
+
+/// Descriptor for `PatchBookmarkRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List patchBookmarkRequestDescriptor = $convert.base64Decode(
+    'ChRQYXRjaEJvb2ttYXJrUmVxdWVzdBIgCgtkZXNjcmlwdGlvbhgBIAEoCVILZGVzY3JpcHRpb2'
+    '4SFAoFaG91cnMYAiABKA1SBWhvdXJzEhgKB21pbnV0ZXMYAyABKA1SB21pbnV0ZXMSGAoHc2Vj'
+    'b25kcxgEIAEoDVIHc2Vjb25kcxIeCgpib29rbWFya0lEGAUgASgNUgpib29rbWFya0lE');
+
+@$core.Deprecated('Use deleteBookmarkRequestDescriptor instead')
+const DeleteBookmarkRequest$json = {
+  '1': 'DeleteBookmarkRequest',
+  '2': [
+    {'1': 'bookmarkID', '3': 1, '4': 1, '5': 13, '10': 'bookmarkID'},
+  ],
+};
+
+/// Descriptor for `DeleteBookmarkRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteBookmarkRequestDescriptor = $convert.base64Decode(
+    'ChVEZWxldGVCb29rbWFya1JlcXVlc3QSHgoKYm9va21hcmtJRBgBIAEoDVIKYm9va21hcmtJRA'
+    '==');
+
 @$core.Deprecated('Use getBookmarksResponseDescriptor instead')
 const GetBookmarksResponse$json = {
   '1': 'GetBookmarksResponse',
   '2': [
-    {'1': 'bookmarks', '3': 1, '4': 3, '5': 11, '6': '.protobuf.Bookmark', '10': 'bookmarks'},
+    {
+      '1': 'bookmarks',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Bookmark',
+      '10': 'bookmarks',
+    },
   ],
 };
 
@@ -252,6 +895,196 @@ final $typed_data.Uint8List getBookmarksResponseDescriptor = $convert.base64Deco
     'ChRHZXRCb29rbWFya3NSZXNwb25zZRIwCglib29rbWFya3MYASADKAsyEi5wcm90b2J1Zi5Cb2'
     '9rbWFya1IJYm9va21hcmtz');
 
+@$core.Deprecated('Use putBookmarkResponseDescriptor instead')
+const PutBookmarkResponse$json = {
+  '1': 'PutBookmarkResponse',
+  '2': [
+    {
+      '1': 'bookmark',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Bookmark',
+      '10': 'bookmark',
+    },
+  ],
+};
+
+/// Descriptor for `PutBookmarkResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List putBookmarkResponseDescriptor = $convert.base64Decode(
+    'ChNQdXRCb29rbWFya1Jlc3BvbnNlEi4KCGJvb2ttYXJrGAEgASgLMhIucHJvdG9idWYuQm9va2'
+    '1hcmtSCGJvb2ttYXJr');
+
+@$core.Deprecated('Use patchBookmarkResponseDescriptor instead')
+const PatchBookmarkResponse$json = {
+  '1': 'PatchBookmarkResponse',
+  '2': [
+    {
+      '1': 'bookmark',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Bookmark',
+      '10': 'bookmark',
+    },
+  ],
+};
+
+/// Descriptor for `PatchBookmarkResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List patchBookmarkResponseDescriptor = $convert.base64Decode(
+    'ChVQYXRjaEJvb2ttYXJrUmVzcG9uc2USLgoIYm9va21hcmsYASABKAsyEi5wcm90b2J1Zi5Cb2'
+    '9rbWFya1IIYm9va21hcms=');
+
+@$core.Deprecated('Use deleteBookmarkResponseDescriptor instead')
+const DeleteBookmarkResponse$json = {
+  '1': 'DeleteBookmarkResponse',
+};
+
+/// Descriptor for `DeleteBookmarkResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteBookmarkResponseDescriptor =
+    $convert.base64Decode('ChZEZWxldGVCb29rbWFya1Jlc3BvbnNl');
+
+@$core.Deprecated('Use bannerAlertDescriptor instead')
+const BannerAlert$json = {
+  '1': 'BannerAlert',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
+    {'1': 'startsAt', '3': 2, '4': 1, '5': 9, '10': 'startsAt'},
+    {'1': 'expiresAt', '3': 3, '4': 1, '5': 9, '10': 'expiresAt'},
+    {'1': 'text', '3': 4, '4': 1, '5': 9, '10': 'text'},
+    {'1': 'warn', '3': 5, '4': 1, '5': 8, '10': 'warn'},
+  ],
+};
+
+/// Descriptor for `BannerAlert`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List bannerAlertDescriptor = $convert.base64Decode(
+    'CgtCYW5uZXJBbGVydBIOCgJpZBgBIAEoDVICaWQSGgoIc3RhcnRzQXQYAiABKAlSCHN0YXJ0c0'
+    'F0EhwKCWV4cGlyZXNBdBgDIAEoCVIJZXhwaXJlc0F0EhIKBHRleHQYBCABKAlSBHRleHQSEgoE'
+    'd2FybhgFIAEoCFIEd2Fybg==');
+
+@$core.Deprecated('Use featureNotificationDescriptor instead')
+const FeatureNotification$json = {
+  '1': 'FeatureNotification',
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
+    {'1': 'Title', '3': 2, '4': 1, '5': 9, '10': 'Title'},
+    {'1': 'Body', '3': 3, '4': 1, '5': 9, '10': 'Body'},
+    {'1': 'Target', '3': 4, '4': 1, '5': 13, '10': 'Target'},
+  ],
+};
+
+/// Descriptor for `FeatureNotification`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List featureNotificationDescriptor = $convert.base64Decode(
+    'ChNGZWF0dXJlTm90aWZpY2F0aW9uEg4KAmlkGAEgASgNUgJpZBIUCgVUaXRsZRgCIAEoCVIFVG'
+    'l0bGUSEgoEQm9keRgDIAEoCVIEQm9keRIWCgZUYXJnZXQYBCABKA1SBlRhcmdldA==');
+
+@$core.Deprecated('Use postDeviceTokenRequestDescriptor instead')
+const PostDeviceTokenRequest$json = {
+  '1': 'PostDeviceTokenRequest',
+  '2': [
+    {'1': 'deviceToken', '3': 1, '4': 1, '5': 9, '10': 'deviceToken'},
+  ],
+};
+
+/// Descriptor for `PostDeviceTokenRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postDeviceTokenRequestDescriptor =
+    $convert.base64Decode(
+        'ChZQb3N0RGV2aWNlVG9rZW5SZXF1ZXN0EiAKC2RldmljZVRva2VuGAEgASgJUgtkZXZpY2VUb2'
+        'tlbg==');
+
+@$core.Deprecated('Use deleteDeviceTokenRequestDescriptor instead')
+const DeleteDeviceTokenRequest$json = {
+  '1': 'DeleteDeviceTokenRequest',
+  '2': [
+    {'1': 'deviceToken', '3': 1, '4': 1, '5': 9, '10': 'deviceToken'},
+  ],
+};
+
+/// Descriptor for `DeleteDeviceTokenRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteDeviceTokenRequestDescriptor =
+    $convert.base64Decode(
+        'ChhEZWxldGVEZXZpY2VUb2tlblJlcXVlc3QSIAoLZGV2aWNlVG9rZW4YASABKAlSC2RldmljZV'
+        'Rva2Vu');
+
+@$core.Deprecated('Use getBannerAlertsRequestDescriptor instead')
+const GetBannerAlertsRequest$json = {
+  '1': 'GetBannerAlertsRequest',
+};
+
+/// Descriptor for `GetBannerAlertsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getBannerAlertsRequestDescriptor =
+    $convert.base64Decode('ChZHZXRCYW5uZXJBbGVydHNSZXF1ZXN0');
+
+@$core.Deprecated('Use getFeatureNotificationsRequestDescriptor instead')
+const GetFeatureNotificationsRequest$json = {
+  '1': 'GetFeatureNotificationsRequest',
+};
+
+/// Descriptor for `GetFeatureNotificationsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getFeatureNotificationsRequestDescriptor =
+    $convert.base64Decode('Ch5HZXRGZWF0dXJlTm90aWZpY2F0aW9uc1JlcXVlc3Q=');
+
+@$core.Deprecated('Use postDeviceTokenResponseDescriptor instead')
+const PostDeviceTokenResponse$json = {
+  '1': 'PostDeviceTokenResponse',
+};
+
+/// Descriptor for `PostDeviceTokenResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List postDeviceTokenResponseDescriptor =
+    $convert.base64Decode('ChdQb3N0RGV2aWNlVG9rZW5SZXNwb25zZQ==');
+
+@$core.Deprecated('Use deleteDeviceTokenResponseDescriptor instead')
+const DeleteDeviceTokenResponse$json = {
+  '1': 'DeleteDeviceTokenResponse',
+};
+
+/// Descriptor for `DeleteDeviceTokenResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List deleteDeviceTokenResponseDescriptor =
+    $convert.base64Decode('ChlEZWxldGVEZXZpY2VUb2tlblJlc3BvbnNl');
+
+@$core.Deprecated('Use getBannerAlertsResponseDescriptor instead')
+const GetBannerAlertsResponse$json = {
+  '1': 'GetBannerAlertsResponse',
+  '2': [
+    {
+      '1': 'bannerAlerts',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.BannerAlert',
+      '10': 'bannerAlerts',
+    },
+  ],
+};
+
+/// Descriptor for `GetBannerAlertsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getBannerAlertsResponseDescriptor =
+    $convert.base64Decode(
+        'ChdHZXRCYW5uZXJBbGVydHNSZXNwb25zZRI5CgxiYW5uZXJBbGVydHMYASADKAsyFS5wcm90b2'
+        'J1Zi5CYW5uZXJBbGVydFIMYmFubmVyQWxlcnRz');
+
+@$core.Deprecated('Use getFeatureNotificationsResponseDescriptor instead')
+const GetFeatureNotificationsResponse$json = {
+  '1': 'GetFeatureNotificationsResponse',
+  '2': [
+    {
+      '1': 'featureNotifications',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.FeatureNotification',
+      '10': 'featureNotifications',
+    },
+  ],
+};
+
+/// Descriptor for `GetFeatureNotificationsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getFeatureNotificationsResponseDescriptor =
+    $convert.base64Decode(
+        'Ch9HZXRGZWF0dXJlTm90aWZpY2F0aW9uc1Jlc3BvbnNlElEKFGZlYXR1cmVOb3RpZmljYXRpb2'
+        '5zGAEgAygLMh0ucHJvdG9idWYuRmVhdHVyZU5vdGlmaWNhdGlvblIUZmVhdHVyZU5vdGlmaWNh'
+        'dGlvbnM=');
+
 @$core.Deprecated('Use courseDescriptor instead')
 const Course$json = {
   '1': 'Course',
@@ -259,17 +1092,63 @@ const Course$json = {
     {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
     {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
     {'1': 'slug', '3': 3, '4': 1, '5': 9, '10': 'slug'},
-    {'1': 'semester', '3': 4, '4': 1, '5': 11, '6': '.protobuf.Semester', '10': 'semester'},
-    {'1': 'TUMOnlineIdentifier', '3': 5, '4': 1, '5': 9, '10': 'TUMOnlineIdentifier'},
+    {
+      '1': 'semester',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Semester',
+      '10': 'semester',
+    },
+    {
+      '1': 'TUMOnlineIdentifier',
+      '3': 5,
+      '4': 1,
+      '5': 9,
+      '10': 'TUMOnlineIdentifier',
+    },
     {'1': 'VODEnabled', '3': 6, '4': 1, '5': 8, '10': 'VODEnabled'},
     {'1': 'downloadsEnabled', '3': 7, '4': 1, '5': 8, '10': 'downloadsEnabled'},
     {'1': 'chatEnabled', '3': 8, '4': 1, '5': 8, '10': 'chatEnabled'},
-    {'1': 'anonymousChatEnabled', '3': 9, '4': 1, '5': 8, '10': 'anonymousChatEnabled'},
-    {'1': 'moderatedChatEnabled', '3': 10, '4': 1, '5': 8, '10': 'moderatedChatEnabled'},
+    {
+      '1': 'anonymousChatEnabled',
+      '3': 9,
+      '4': 1,
+      '5': 8,
+      '10': 'anonymousChatEnabled',
+    },
+    {
+      '1': 'moderatedChatEnabled',
+      '3': 10,
+      '4': 1,
+      '5': 8,
+      '10': 'moderatedChatEnabled',
+    },
     {'1': 'vodChatEnabled', '3': 11, '4': 1, '5': 8, '10': 'vodChatEnabled'},
-    {'1': 'streams', '3': 12, '4': 3, '5': 11, '6': '.protobuf.Stream', '10': 'streams'},
-    {'1': 'cameraPresetPreferences', '3': 13, '4': 1, '5': 9, '10': 'cameraPresetPreferences'},
-    {'1': 'sourcePreferences', '3': 14, '4': 1, '5': 9, '10': 'sourcePreferences'},
+    {
+      '1': 'streams',
+      '3': 12,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Stream',
+      '10': 'streams',
+    },
+    {
+      '1': 'cameraPresetPreferences',
+      '3': 13,
+      '4': 1,
+      '5': 9,
+      '10': 'cameraPresetPreferences',
+    },
+    {
+      '1': 'sourcePreferences',
+      '3': 14,
+      '4': 1,
+      '5': 9,
+      '10': 'sourcePreferences',
+    },
+    {'1': 'lastRecordingID', '3': 15, '4': 1, '5': 13, '10': 'lastRecordingID'},
+    {'1': 'nextLectureID', '3': 16, '4': 1, '5': 13, '10': 'nextLectureID'},
   ],
 };
 
@@ -285,56 +1164,211 @@ final $typed_data.Uint8List courseDescriptor = $convert.base64Decode(
     '5hYmxlZBgLIAEoCFIOdm9kQ2hhdEVuYWJsZWQSKgoHc3RyZWFtcxgMIAMoCzIQLnByb3RvYnVm'
     'LlN0cmVhbVIHc3RyZWFtcxI4ChdjYW1lcmFQcmVzZXRQcmVmZXJlbmNlcxgNIAEoCVIXY2FtZX'
     'JhUHJlc2V0UHJlZmVyZW5jZXMSLAoRc291cmNlUHJlZmVyZW5jZXMYDiABKAlSEXNvdXJjZVBy'
-    'ZWZlcmVuY2Vz');
+    'ZWZlcmVuY2VzEigKD2xhc3RSZWNvcmRpbmdJRBgPIAEoDVIPbGFzdFJlY29yZGluZ0lEEiQKDW'
+    '5leHRMZWN0dXJlSUQYECABKA1SDW5leHRMZWN0dXJlSUQ=');
 
 @$core.Deprecated('Use semesterDescriptor instead')
 const Semester$json = {
   '1': 'Semester',
   '2': [
-    {'1': 'teachingTerm', '3': 3, '4': 1, '5': 9, '10': 'teachingTerm'},
-    {'1': 'year', '3': 4, '4': 1, '5': 13, '10': 'year'},
+    {'1': 'teachingTerm', '3': 1, '4': 1, '5': 9, '10': 'teachingTerm'},
+    {'1': 'year', '3': 2, '4': 1, '5': 13, '10': 'year'},
   ],
 };
 
 /// Descriptor for `Semester`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List semesterDescriptor = $convert.base64Decode(
-    'CghTZW1lc3RlchIiCgx0ZWFjaGluZ1Rlcm0YAyABKAlSDHRlYWNoaW5nVGVybRISCgR5ZWFyGA'
-    'QgASgNUgR5ZWFy');
+    'CghTZW1lc3RlchIiCgx0ZWFjaGluZ1Rlcm0YASABKAlSDHRlYWNoaW5nVGVybRISCgR5ZWFyGA'
+    'IgASgNUgR5ZWFy');
+
+@$core.Deprecated('Use getPublicCoursesRequestDescriptor instead')
+const GetPublicCoursesRequest$json = {
+  '1': 'GetPublicCoursesRequest',
+  '2': [
+    {'1': 'year', '3': 1, '4': 1, '5': 13, '10': 'year'},
+    {'1': 'term', '3': 2, '4': 1, '5': 9, '10': 'term'},
+    {'1': 'limit', '3': 3, '4': 1, '5': 13, '10': 'limit'},
+    {'1': 'skip', '3': 4, '4': 1, '5': 13, '10': 'skip'},
+  ],
+};
+
+/// Descriptor for `GetPublicCoursesRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getPublicCoursesRequestDescriptor = $convert.base64Decode(
+    'ChdHZXRQdWJsaWNDb3Vyc2VzUmVxdWVzdBISCgR5ZWFyGAEgASgNUgR5ZWFyEhIKBHRlcm0YAi'
+    'ABKAlSBHRlcm0SFAoFbGltaXQYAyABKA1SBWxpbWl0EhIKBHNraXAYBCABKA1SBHNraXA=');
+
+@$core.Deprecated('Use getSemestersRequestDescriptor instead')
+const GetSemestersRequest$json = {
+  '1': 'GetSemestersRequest',
+};
+
+/// Descriptor for `GetSemestersRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getSemestersRequestDescriptor =
+    $convert.base64Decode('ChNHZXRTZW1lc3RlcnNSZXF1ZXN0');
+
+@$core.Deprecated('Use getCourseStreamsRequestDescriptor instead')
+const GetCourseStreamsRequest$json = {
+  '1': 'GetCourseStreamsRequest',
+  '2': [
+    {'1': 'courseID', '3': 1, '4': 1, '5': 13, '10': 'courseID'},
+  ],
+};
+
+/// Descriptor for `GetCourseStreamsRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getCourseStreamsRequestDescriptor =
+    $convert.base64Decode(
+  'ChdHZXRDb3Vyc2VTdHJlYW1zUmVxdWVzdBIaCghjb3Vyc2VJRBgBIAEoDVIIY291cnNlSUQ=',
+);
+
+@$core.Deprecated('Use getPublicCoursesResponseDescriptor instead')
+const GetPublicCoursesResponse$json = {
+  '1': 'GetPublicCoursesResponse',
+  '2': [
+    {
+      '1': 'courses',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Course',
+      '10': 'courses',
+    },
+  ],
+};
+
+/// Descriptor for `GetPublicCoursesResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getPublicCoursesResponseDescriptor =
+    $convert.base64Decode(
+        'ChhHZXRQdWJsaWNDb3Vyc2VzUmVzcG9uc2USKgoHY291cnNlcxgBIAMoCzIQLnByb3RvYnVmLk'
+        'NvdXJzZVIHY291cnNlcw==');
+
+@$core.Deprecated('Use getSemestersResponseDescriptor instead')
+const GetSemestersResponse$json = {
+  '1': 'GetSemestersResponse',
+  '2': [
+    {
+      '1': 'current',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Semester',
+      '10': 'current',
+    },
+    {
+      '1': 'semesters',
+      '3': 2,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Semester',
+      '10': 'semesters',
+    },
+  ],
+};
+
+/// Descriptor for `GetSemestersResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getSemestersResponseDescriptor = $convert.base64Decode(
+    'ChRHZXRTZW1lc3RlcnNSZXNwb25zZRIsCgdjdXJyZW50GAEgASgLMhIucHJvdG9idWYuU2VtZX'
+    'N0ZXJSB2N1cnJlbnQSMAoJc2VtZXN0ZXJzGAIgAygLMhIucHJvdG9idWYuU2VtZXN0ZXJSCXNl'
+    'bWVzdGVycw==');
+
+@$core.Deprecated('Use getCourseStreamsResponseDescriptor instead')
+const GetCourseStreamsResponse$json = {
+  '1': 'GetCourseStreamsResponse',
+  '2': [
+    {
+      '1': 'streams',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Stream',
+      '10': 'streams',
+    },
+  ],
+};
+
+/// Descriptor for `GetCourseStreamsResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getCourseStreamsResponseDescriptor =
+    $convert.base64Decode(
+        'ChhHZXRDb3Vyc2VTdHJlYW1zUmVzcG9uc2USKgoHc3RyZWFtcxgBIAMoCzIQLnByb3RvYnVmLl'
+        'N0cmVhbVIHc3RyZWFtcw==');
 
 @$core.Deprecated('Use streamDescriptor instead')
 const Stream$json = {
   '1': 'Stream',
   '2': [
-    {'1': 'id', '3': 1, '4': 1, '5': 4, '10': 'id'},
+    {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'},
     {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
     {'1': 'description', '3': 3, '4': 1, '5': 9, '10': 'description'},
     {'1': 'courseID', '3': 4, '4': 1, '5': 13, '10': 'courseID'},
-    {'1': 'start', '3': 5, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'start'},
-    {'1': 'end', '3': 6, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'end'},
+    {
+      '1': 'start',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Timestamp',
+      '10': 'start',
+    },
+    {
+      '1': 'end',
+      '3': 6,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Timestamp',
+      '10': 'end',
+    },
     {'1': 'chatEnabled', '3': 7, '4': 1, '5': 8, '10': 'chatEnabled'},
     {'1': 'roomName', '3': 8, '4': 1, '5': 9, '10': 'roomName'},
     {'1': 'roomCode', '3': 9, '4': 1, '5': 9, '10': 'roomCode'},
     {'1': 'eventTypeName', '3': 10, '4': 1, '5': 9, '10': 'eventTypeName'},
-    {'1': 'TUMOnlineEventID', '3': 11, '4': 1, '5': 13, '10': 'TUMOnlineEventID'},
-    {'1': 'seriesIdentifier', '3': 12, '4': 1, '5': 9, '10': 'seriesIdentifier'},
+    {
+      '1': 'TUMOnlineEventID',
+      '3': 11,
+      '4': 1,
+      '5': 13,
+      '10': 'TUMOnlineEventID',
+    },
+    {
+      '1': 'seriesIdentifier',
+      '3': 12,
+      '4': 1,
+      '5': 9,
+      '10': 'seriesIdentifier',
+    },
     {'1': 'playlistUrl', '3': 13, '4': 1, '5': 9, '10': 'playlistUrl'},
     {'1': 'playlistUrlPRES', '3': 14, '4': 1, '5': 9, '10': 'playlistUrlPRES'},
     {'1': 'playlistUrlCAM', '3': 15, '4': 1, '5': 9, '10': 'playlistUrlCAM'},
     {'1': 'liveNow', '3': 16, '4': 1, '5': 8, '10': 'liveNow'},
-    {'1': 'liveNowTimestamp', '3': 17, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'liveNowTimestamp'},
+    {
+      '1': 'liveNowTimestamp',
+      '3': 17,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Timestamp',
+      '10': 'liveNowTimestamp',
+    },
     {'1': 'recording', '3': 18, '4': 1, '5': 8, '10': 'recording'},
     {'1': 'premiere', '3': 19, '4': 1, '5': 8, '10': 'premiere'},
     {'1': 'ended', '3': 20, '4': 1, '5': 8, '10': 'ended'},
     {'1': 'vodViews', '3': 21, '4': 1, '5': 13, '10': 'vodViews'},
     {'1': 'startOffset', '3': 22, '4': 1, '5': 13, '10': 'startOffset'},
     {'1': 'endOffset', '3': 23, '4': 1, '5': 13, '10': 'endOffset'},
-    {'1': 'duration', '3': 28, '4': 1, '5': 5, '10': 'duration'},
+    {'1': 'duration', '3': 28, '4': 1, '5': 13, '10': 'duration'},
+    {
+      '1': 'downloads',
+      '3': 29,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Download',
+      '10': 'downloads',
+    },
+    {'1': 'isPlanned', '3': 30, '4': 1, '5': 8, '10': 'isPlanned'},
+    {'1': 'isComingUp', '3': 31, '4': 1, '5': 8, '10': 'isComingUp'},
+    {'1': 'HLSUrl', '3': 32, '4': 1, '5': 9, '10': 'HLSUrl'},
   ],
 };
 
 /// Descriptor for `Stream`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List streamDescriptor = $convert.base64Decode(
-    'CgZTdHJlYW0SDgoCaWQYASABKARSAmlkEhIKBG5hbWUYAiABKAlSBG5hbWUSIAoLZGVzY3JpcH'
+    'CgZTdHJlYW0SDgoCaWQYASABKA1SAmlkEhIKBG5hbWUYAiABKAlSBG5hbWUSIAoLZGVzY3JpcH'
     'Rpb24YAyABKAlSC2Rlc2NyaXB0aW9uEhoKCGNvdXJzZUlEGAQgASgNUghjb3Vyc2VJRBIwCgVz'
     'dGFydBgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSBXN0YXJ0EiwKA2VuZBgGIA'
     'EoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSA2VuZBIgCgtjaGF0RW5hYmxlZBgHIAEo'
@@ -348,6 +1382,256 @@ final $typed_data.Uint8List streamDescriptor = $convert.base64Decode(
     'RhbXBSEGxpdmVOb3dUaW1lc3RhbXASHAoJcmVjb3JkaW5nGBIgASgIUglyZWNvcmRpbmcSGgoI'
     'cHJlbWllcmUYEyABKAhSCHByZW1pZXJlEhQKBWVuZGVkGBQgASgIUgVlbmRlZBIaCgh2b2RWaW'
     'V3cxgVIAEoDVIIdm9kVmlld3MSIAoLc3RhcnRPZmZzZXQYFiABKA1SC3N0YXJ0T2Zmc2V0EhwK'
-    'CWVuZE9mZnNldBgXIAEoDVIJZW5kT2Zmc2V0EhoKCGR1cmF0aW9uGBwgASgFUghkdXJhdGlvbg'
-    '==');
+    'CWVuZE9mZnNldBgXIAEoDVIJZW5kT2Zmc2V0EhoKCGR1cmF0aW9uGBwgASgNUghkdXJhdGlvbh'
+    'IwCglkb3dubG9hZHMYHSADKAsyEi5wcm90b2J1Zi5Eb3dubG9hZFIJZG93bmxvYWRzEhwKCWlz'
+    'UGxhbm5lZBgeIAEoCFIJaXNQbGFubmVkEh4KCmlzQ29taW5nVXAYHyABKAhSCmlzQ29taW5nVX'
+    'ASFgoGSExTVXJsGCAgASgJUgZITFNVcmw=');
+
+@$core.Deprecated('Use getStreamRequestDescriptor instead')
+const GetStreamRequest$json = {
+  '1': 'GetStreamRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `GetStreamRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getStreamRequestDescriptor = $convert.base64Decode(
+  'ChBHZXRTdHJlYW1SZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUghzdHJlYW1JRA==',
+);
+
+@$core.Deprecated('Use getNowLiveRequestDescriptor instead')
+const GetNowLiveRequest$json = {
+  '1': 'GetNowLiveRequest',
+};
+
+/// Descriptor for `GetNowLiveRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getNowLiveRequestDescriptor =
+    $convert.base64Decode('ChFHZXROb3dMaXZlUmVxdWVzdA==');
+
+@$core.Deprecated('Use getThumbsLiveRequestDescriptor instead')
+const GetThumbsLiveRequest$json = {
+  '1': 'GetThumbsLiveRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `GetThumbsLiveRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getThumbsLiveRequestDescriptor =
+    $convert.base64Decode(
+  'ChRHZXRUaHVtYnNMaXZlUmVxdWVzdBIaCghzdHJlYW1JRBgBIAEoDVIIc3RyZWFtSUQ=',
+);
+
+@$core.Deprecated('Use getThumbsVODRequestDescriptor instead')
+const GetThumbsVODRequest$json = {
+  '1': 'GetThumbsVODRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `GetThumbsVODRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getThumbsVODRequestDescriptor =
+    $convert.base64Decode(
+  'ChNHZXRUaHVtYnNWT0RSZXF1ZXN0EhoKCHN0cmVhbUlEGAEgASgNUghzdHJlYW1JRA==',
+);
+
+@$core.Deprecated('Use getStreamResponseDescriptor instead')
+const GetStreamResponse$json = {
+  '1': 'GetStreamResponse',
+  '2': [
+    {
+      '1': 'stream',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Stream',
+      '10': 'stream',
+    },
+  ],
+};
+
+/// Descriptor for `GetStreamResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getStreamResponseDescriptor = $convert.base64Decode(
+    'ChFHZXRTdHJlYW1SZXNwb25zZRIoCgZzdHJlYW0YASABKAsyEC5wcm90b2J1Zi5TdHJlYW1SBn'
+    'N0cmVhbQ==');
+
+@$core.Deprecated('Use getNowLiveResponseDescriptor instead')
+const GetNowLiveResponse$json = {
+  '1': 'GetNowLiveResponse',
+  '2': [
+    {
+      '1': 'stream',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.protobuf.Stream',
+      '10': 'stream',
+    },
+  ],
+};
+
+/// Descriptor for `GetNowLiveResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getNowLiveResponseDescriptor = $convert.base64Decode(
+    'ChJHZXROb3dMaXZlUmVzcG9uc2USKAoGc3RyZWFtGAEgAygLMhAucHJvdG9idWYuU3RyZWFtUg'
+    'ZzdHJlYW0=');
+
+@$core.Deprecated('Use getThumbsVODResponseDescriptor instead')
+const GetThumbsVODResponse$json = {
+  '1': 'GetThumbsVODResponse',
+  '2': [
+    {'1': 'path', '3': 1, '4': 1, '5': 9, '10': 'path'},
+  ],
+};
+
+/// Descriptor for `GetThumbsVODResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getThumbsVODResponseDescriptor = $convert
+    .base64Decode('ChRHZXRUaHVtYnNWT0RSZXNwb25zZRISCgRwYXRoGAEgASgJUgRwYXRo');
+
+@$core.Deprecated('Use getThumbsLiveResponseDescriptor instead')
+const GetThumbsLiveResponse$json = {
+  '1': 'GetThumbsLiveResponse',
+  '2': [
+    {'1': 'path', '3': 1, '4': 1, '5': 9, '10': 'path'},
+  ],
+};
+
+/// Descriptor for `GetThumbsLiveResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getThumbsLiveResponseDescriptor =
+    $convert.base64Decode(
+  'ChVHZXRUaHVtYnNMaXZlUmVzcG9uc2USEgoEcGF0aBgBIAEoCVIEcGF0aA==',
+);
+
+@$core.Deprecated('Use downloadDescriptor instead')
+const Download$json = {
+  '1': 'Download',
+  '2': [
+    {'1': 'friendlyName', '3': 1, '4': 1, '5': 9, '10': 'friendlyName'},
+    {'1': 'downloadURL', '3': 2, '4': 1, '5': 9, '10': 'downloadURL'},
+  ],
+};
+
+/// Descriptor for `Download`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List downloadDescriptor = $convert.base64Decode(
+    'CghEb3dubG9hZBIiCgxmcmllbmRseU5hbWUYASABKAlSDGZyaWVuZGx5TmFtZRIgCgtkb3dubG'
+    '9hZFVSTBgCIAEoCVILZG93bmxvYWRVUkw=');
+
+@$core.Deprecated('Use progressDescriptor instead')
+const Progress$json = {
+  '1': 'Progress',
+  '2': [
+    {'1': 'progress', '3': 1, '4': 1, '5': 2, '10': 'progress'},
+    {'1': 'watched', '3': 2, '4': 1, '5': 8, '10': 'watched'},
+    {'1': 'userID', '3': 3, '4': 1, '5': 13, '10': 'userID'},
+    {'1': 'streamID', '3': 4, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `Progress`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List progressDescriptor = $convert.base64Decode(
+    'CghQcm9ncmVzcxIaCghwcm9ncmVzcxgBIAEoAlIIcHJvZ3Jlc3MSGAoHd2F0Y2hlZBgCIAEoCF'
+    'IHd2F0Y2hlZBIWCgZ1c2VySUQYAyABKA1SBnVzZXJJRBIaCghzdHJlYW1JRBgEIAEoDVIIc3Ry'
+    'ZWFtSUQ=');
+
+@$core.Deprecated('Use getProgressRequestDescriptor instead')
+const GetProgressRequest$json = {
+  '1': 'GetProgressRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `GetProgressRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getProgressRequestDescriptor =
+    $convert.base64Decode(
+  'ChJHZXRQcm9ncmVzc1JlcXVlc3QSGgoIc3RyZWFtSUQYASABKA1SCHN0cmVhbUlE',
+);
+
+@$core.Deprecated('Use putProgressRequestDescriptor instead')
+const PutProgressRequest$json = {
+  '1': 'PutProgressRequest',
+  '2': [
+    {'1': 'progress', '3': 1, '4': 1, '5': 2, '10': 'progress'},
+    {'1': 'streamID', '3': 3, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `PutProgressRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List putProgressRequestDescriptor = $convert.base64Decode(
+    'ChJQdXRQcm9ncmVzc1JlcXVlc3QSGgoIcHJvZ3Jlc3MYASABKAJSCHByb2dyZXNzEhoKCHN0cm'
+    'VhbUlEGAMgASgNUghzdHJlYW1JRA==');
+
+@$core.Deprecated('Use markAsWatchedRequestDescriptor instead')
+const MarkAsWatchedRequest$json = {
+  '1': 'MarkAsWatchedRequest',
+  '2': [
+    {'1': 'streamID', '3': 1, '4': 1, '5': 13, '10': 'streamID'},
+  ],
+};
+
+/// Descriptor for `MarkAsWatchedRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List markAsWatchedRequestDescriptor =
+    $convert.base64Decode(
+  'ChRNYXJrQXNXYXRjaGVkUmVxdWVzdBIaCghzdHJlYW1JRBgBIAEoDVIIc3RyZWFtSUQ=',
+);
+
+@$core.Deprecated('Use getProgressResponseDescriptor instead')
+const GetProgressResponse$json = {
+  '1': 'GetProgressResponse',
+  '2': [
+    {
+      '1': 'progress',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Progress',
+      '10': 'progress',
+    },
+  ],
+};
+
+/// Descriptor for `GetProgressResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List getProgressResponseDescriptor = $convert.base64Decode(
+    'ChNHZXRQcm9ncmVzc1Jlc3BvbnNlEi4KCHByb2dyZXNzGAEgASgLMhIucHJvdG9idWYuUHJvZ3'
+    'Jlc3NSCHByb2dyZXNz');
+
+@$core.Deprecated('Use putProgressResponseDescriptor instead')
+const PutProgressResponse$json = {
+  '1': 'PutProgressResponse',
+  '2': [
+    {
+      '1': 'progress',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Progress',
+      '10': 'progress',
+    },
+  ],
+};
+
+/// Descriptor for `PutProgressResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List putProgressResponseDescriptor = $convert.base64Decode(
+    'ChNQdXRQcm9ncmVzc1Jlc3BvbnNlEi4KCHByb2dyZXNzGAEgASgLMhIucHJvdG9idWYuUHJvZ3'
+    'Jlc3NSCHByb2dyZXNz');
+
+@$core.Deprecated('Use markAsWatchedResponseDescriptor instead')
+const MarkAsWatchedResponse$json = {
+  '1': 'MarkAsWatchedResponse',
+  '2': [
+    {
+      '1': 'progress',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.protobuf.Progress',
+      '10': 'progress',
+    },
+  ],
+};
 
+/// Descriptor for `MarkAsWatchedResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List markAsWatchedResponseDescriptor = $convert.base64Decode(
+    'ChVNYXJrQXNXYXRjaGVkUmVzcG9uc2USLgoIcHJvZ3Jlc3MYASABKAsyEi5wcm90b2J1Zi5Qcm'
+    '9ncmVzc1IIcHJvZ3Jlc3M=');
diff --git a/lib/base/networking/api/google/protobuf/empty.pb.dart b/lib/base/networking/api/google/protobuf/empty.pb.dart
index 05ae77c7..5c5ce508 100644
--- a/lib/base/networking/api/google/protobuf/empty.pb.dart
+++ b/lib/base/networking/api/google/protobuf/empty.pb.dart
@@ -23,23 +23,29 @@ import 'package:protobuf/protobuf.dart' as $pb;
 class Empty extends $pb.GeneratedMessage {
   factory Empty() => create();
   Empty._() : super();
-  factory Empty.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Empty.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Empty', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
+  factory Empty.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory Empty.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Empty',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'),
+      createEmptyInstance: create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Empty clone() => Empty()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Empty copyWith(void Function(Empty) updates) => super.copyWith((message) => updates(message as Empty)) as Empty;
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Empty copyWith(void Function(Empty) updates) =>
+      super.copyWith((message) => updates(message as Empty)) as Empty;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -48,9 +54,10 @@ class Empty extends $pb.GeneratedMessage {
   Empty createEmptyInstance() => create();
   static $pb.PbList<Empty> createRepeated() => $pb.PbList<Empty>();
   @$core.pragma('dart2js:noInline')
-  static Empty getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Empty>(create);
+  static Empty getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Empty>(create);
   static Empty? _defaultInstance;
 }
 
-
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/base/networking/api/google/protobuf/empty.pbenum.dart b/lib/base/networking/api/google/protobuf/empty.pbenum.dart
index 510bac1d..2f2a7613 100644
--- a/lib/base/networking/api/google/protobuf/empty.pbenum.dart
+++ b/lib/base/networking/api/google/protobuf/empty.pbenum.dart
@@ -8,4 +8,3 @@
 // ignore_for_file: constant_identifier_names, library_prefixes
 // ignore_for_file: non_constant_identifier_names, prefer_final_fields
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
diff --git a/lib/base/networking/api/google/protobuf/empty.pbjson.dart b/lib/base/networking/api/google/protobuf/empty.pbjson.dart
index b5c72ed2..35f6e2ec 100644
--- a/lib/base/networking/api/google/protobuf/empty.pbjson.dart
+++ b/lib/base/networking/api/google/protobuf/empty.pbjson.dart
@@ -19,7 +19,5 @@ const Empty$json = {
 };
 
 /// Descriptor for `Empty`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List emptyDescriptor = $convert.base64Decode(
-    'CgVFbXB0eQ==',
-);
-
+final $typed_data.Uint8List emptyDescriptor =
+    $convert.base64Decode('CgVFbXB0eQ==');
diff --git a/lib/base/networking/api/google/protobuf/timestamp.pb.dart b/lib/base/networking/api/google/protobuf/timestamp.pb.dart
index ea44b44e..48e11b93 100644
--- a/lib/base/networking/api/google/protobuf/timestamp.pb.dart
+++ b/lib/base/networking/api/google/protobuf/timestamp.pb.dart
@@ -119,25 +119,33 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
     return $result;
   }
   Timestamp._() : super();
-  factory Timestamp.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Timestamp.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory Timestamp.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory Timestamp.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
 
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Timestamp', package: const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'), createEmptyInstance: create, toProto3Json: $mixin.TimestampMixin.toProto3JsonHelper, fromProto3Json: $mixin.TimestampMixin.fromProto3JsonHelper)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Timestamp',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'),
+      createEmptyInstance: create,
+      toProto3Json: $mixin.TimestampMixin.toProto3JsonHelper,
+      fromProto3Json: $mixin.TimestampMixin.fromProto3JsonHelper)
     ..aInt64(1, _omitFieldNames ? '' : 'seconds')
     ..a<$core.int>(2, _omitFieldNames ? '' : 'nanos', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Timestamp clone() => Timestamp()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Timestamp copyWith(void Function(Timestamp) updates) => super.copyWith((message) => updates(message as Timestamp)) as Timestamp;
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Timestamp copyWith(void Function(Timestamp) updates) =>
+      super.copyWith((message) => updates(message as Timestamp)) as Timestamp;
 
   $pb.BuilderInfo get info_ => _i;
 
@@ -146,7 +154,8 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   Timestamp createEmptyInstance() => create();
   static $pb.PbList<Timestamp> createRepeated() => $pb.PbList<Timestamp>();
   @$core.pragma('dart2js:noInline')
-  static Timestamp getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Timestamp>(create);
+  static Timestamp getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Timestamp>(create);
   static Timestamp? _defaultInstance;
 
   /// Represents seconds of UTC time since Unix epoch
@@ -155,7 +164,10 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   @$pb.TagNumber(1)
   $fixnum.Int64 get seconds => $_getI64(0);
   @$pb.TagNumber(1)
-  set seconds($fixnum.Int64 v) { $_setInt64(0, v); }
+  set seconds($fixnum.Int64 v) {
+    $_setInt64(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasSeconds() => $_has(0);
   @$pb.TagNumber(1)
@@ -168,11 +180,15 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   @$pb.TagNumber(2)
   $core.int get nanos => $_getIZ(1);
   @$pb.TagNumber(2)
-  set nanos($core.int v) { $_setSignedInt32(1, v); }
+  set nanos($core.int v) {
+    $_setSignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasNanos() => $_has(1);
   @$pb.TagNumber(2)
   void clearNanos() => clearField(2);
+
   /// Creates a new instance from [dateTime].
   ///
   /// Time zone information will not be preserved.
@@ -183,6 +199,6 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   }
 }
 
-
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/base/networking/api/google/protobuf/timestamp.pbenum.dart b/lib/base/networking/api/google/protobuf/timestamp.pbenum.dart
index 30275f6a..a194b805 100644
--- a/lib/base/networking/api/google/protobuf/timestamp.pbenum.dart
+++ b/lib/base/networking/api/google/protobuf/timestamp.pbenum.dart
@@ -8,4 +8,3 @@
 // ignore_for_file: constant_identifier_names, library_prefixes
 // ignore_for_file: non_constant_identifier_names, prefer_final_fields
 // ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
diff --git a/lib/base/networking/api/google/protobuf/timestamp.pbjson.dart b/lib/base/networking/api/google/protobuf/timestamp.pbjson.dart
index 3dfd63b5..39ab20fa 100644
--- a/lib/base/networking/api/google/protobuf/timestamp.pbjson.dart
+++ b/lib/base/networking/api/google/protobuf/timestamp.pbjson.dart
@@ -26,4 +26,3 @@ const Timestamp$json = {
 final $typed_data.Uint8List timestampDescriptor = $convert.base64Decode(
     'CglUaW1lc3RhbXASGAoHc2Vjb25kcxgBIAEoA1IHc2Vjb25kcxIUCgVuYW5vcxgCIAEoBVIFbm'
     'Fub3M=');
-
diff --git a/lib/base/networking/api/handler/api_handler.dart b/lib/base/networking/api/handler/api_handler.dart
index 495ef04e..28da2116 100644
--- a/lib/base/networking/api/handler/api_handler.dart
+++ b/lib/base/networking/api/handler/api_handler.dart
@@ -1,37 +1,29 @@
 import 'dart:convert';
-
 import 'package:dio/dio.dart';
 import 'package:gocast_mobile/models/error/error_model.dart';
 import 'package:logger/logger.dart';
 
+/// Handles HTTP communication for the application.
 class ApiHandler {
   static final Logger _logger = Logger();
 
-  /// Handles an HTTP response.
+  /// Handles an HTTP error response.
   ///
-  /// This method checks the status code of the HTTP response and throws an [AppError] if necessary.
-  /// It uses the `handleHttpStatus` method to check the status code and throw the appropriate error.
+  /// This method takes a [response] and handles the error based on the status code.
   ///
-  /// The `apiMessage` from the response is passed to the `handleHttpStatus` method and used for the error message
-  /// of the [AppError.argumentError] thrown for a 400 status code.
+  /// Throws an [AppError] if the status code is not in the 2xx range.
   static void handleHttpResponse(Response response) {
     _logger
         .i('Received HTTP response with status code: ${response.statusCode}');
-
     if (response.data != null && response.data != '') {
       try {
-        // Attempt to decode the response body
         var responseBody = jsonDecode(response.data);
         String? apiMessage = responseBody['message'];
-
-        // Log the extracted message
         if (apiMessage != null) {
           _logger.i('API message: $apiMessage');
         }
-
         handleHttpStatus(response.statusCode, apiMessage);
       } catch (e) {
-        // Log any JSON decoding errors
         _logger.e('Error decoding response data: $e');
       }
     } else {
@@ -40,58 +32,30 @@ class ApiHandler {
     }
   }
 
-  /// Handles the HTTP status code of a response and throws an [AppError] if necessary.
-  ///
-  /// This method checks the HTTP status code and throws an [AppError] for certain status codes.
-  /// If the status code is null or not in the range of 100 to 399, it throws an [AppError].
-  /// For status codes 400, 401, 403, 404, and 500, it throws specific [AppError]s.
-  /// For all other status codes, it throws an [AppError.unknownError].
-  ///
-  /// The method also accepts an optional `apiMessage` parameter. If provided, this message
-  /// is used for the error message of the [AppError.argumentError] thrown for a 400 status code.
+  /// Handles an HTTP status code.
   ///
-  /// - 1xx-3xx: No error is thrown
-  /// - 400: [AppError.argumentError] is thrown with `apiMessage` as the error message
-  /// - 401: [AppError.authenticationError] is thrown
-  /// - 403: [AppError.forbidden] is thrown
-  /// - 404: [AppError.notFound] is thrown
-  /// - 500: [AppError.internalServerError] is thrown
-  /// - Other: [AppError.unknownError] is thrown
+  /// This method takes a [statusCode] and [apiMessage] and throws an [AppError]
+  /// based on the status code.
   static void handleHttpStatus(int? statusCode, String? apiMessage) {
-    // Log the received status code and API message
-    _logger
-        .d('Handling HTTP status code: $statusCode, API message: $apiMessage');
-
+    _logger.i('Handling HTTP status code: $statusCode, API message: $apiMessage');
     if (statusCode == null) {
-      _logger.e('Status code is null');
       throw AppError.unknownError("Status code is null");
     }
-
-    if (statusCode >= 100 && statusCode < 400) {
-      // Log successful response
-      _logger.i('Successful HTTP response with status code: $statusCode');
-      return;
-    }
-    // Handle error status codes
-    switch (statusCode) {
-      case 400:
-        _logger.w('HTTP 400 Bad Request: $apiMessage');
-        throw AppError.argumentError(apiMessage ?? "Bad Request");
-      case 401:
-        _logger.w('HTTP 401 Unauthorized');
-        throw AppError.authenticationError();
-      case 403:
-        _logger.w('HTTP 403 Forbidden');
-        throw AppError.forbidden();
-      case 404:
-        _logger.w('HTTP 404 Not Found');
-        throw AppError.notFound();
-      case 500:
-        _logger.e('HTTP 500 Internal Server Error');
-        throw AppError.internalServerError();
-      default:
-        _logger.e('Unknown error with status code: $statusCode');
-        throw AppError.unknownError("Status code: $statusCode");
+    if (statusCode < 100 || statusCode >= 400) {
+      switch (statusCode) {
+        case 400:
+          throw AppError.argumentError(apiMessage ?? "Bad Request");
+        case 401:
+          throw AppError.authenticationError();
+        case 403:
+          throw AppError.forbidden();
+        case 404:
+          throw AppError.notFound();
+        case 500:
+          throw AppError.internalServerError();
+        default:
+          throw AppError.unknownError("Status code: $statusCode");
+      }
     }
   }
 }
diff --git a/lib/base/networking/api/handler/auth_handler.dart b/lib/base/networking/api/handler/auth_handler.dart
index ab148ad2..612b54c8 100644
--- a/lib/base/networking/api/handler/auth_handler.dart
+++ b/lib/base/networking/api/handler/auth_handler.dart
@@ -8,27 +8,27 @@ import 'package:gocast_mobile/base/networking/api/handler/api_handler.dart';
 import 'package:gocast_mobile/base/networking/api/handler/token_handler.dart';
 import 'package:gocast_mobile/config/app_config.dart';
 import 'package:gocast_mobile/models/error/error_model.dart';
-import 'package:gocast_mobile/view_models/UserViewModel.dart';
-import 'package:gocast_mobile/views/utils/globals.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/globals.dart';
 import 'package:logger/logger.dart';
 
-/// Handles authentication for the application.
+///Authentication handler for the application.
 class AuthHandler {
   static final Logger _logger = Logger();
   static bool isLoginSuccessful = false;
 
-  /// Performs basic authentication.
+  /// the basic authentication method for internal Users
   ///
-  /// This method sends a POST request to the basic login URL with the given
-  /// username and password. If the request is successful, it saves the JWT token.
+  /// This method takes a [username] and [password] and sends a POST request to the server.
+  /// The server will respond with a JWT token that will be saved in the cookie jar.
   ///
-  /// Throws an [AppError] if a network error occurs or if no JWT-cookie is set.
+  /// Throws an [AppError] if a network error occurs or if the gRPC call fails.
   static Future<void> basicAuth(
     String username,
     String password,
   ) async {
-    var url = Routes.basicLogin;
     _logger.i('Starting basic authentication for user: $username');
+    var url = Routes.basicLogin;
     final cookieJar = CookieJar();
     final dio = Dio(
       BaseOptions(
@@ -36,68 +36,85 @@ class AuthHandler {
         validateStatus: (status) {
           return status! < 500;
         },
+        receiveTimeout: const Duration(seconds: 3),
       ),
     );
     dio.interceptors.add(CookieManager(cookieJar));
-
     final formData = FormData.fromMap({
       'username': username,
       'password': password,
     });
-
+    Response response;
+    try {
+     response = await dio.post(url, data: formData);
+     _logger.i('Received HTTP response with status code: ${response.statusCode}');
+    } catch (e) {
+      _logger.e('Error during basic authentication for user: $username, Error: $e');
+      throw AppError.userError();
+    }
     try {
-      final response = await dio.post(url, data: formData);
       ApiHandler.handleHttpResponse(response);
       _logger.i('Authentication successful for user: $username');
     } catch (e) {
       _logger.e('Authentication failed for user: $username, Error: $e');
-      // Throw the error so it can be caught and handled by the caller of basicAuth
-      throw AppError.networkError(e.toString());
     }
-
-    // Save jwt token
     try {
       List<Cookie> cookies = await cookieJar.loadForRequest(Uri.parse(url));
-      await TokenHandler.saveToken('jwt', cookies);
+      await TokenHandler.saveTokenFromCookies('jwt', cookies);
       _logger.i('JWT token saved successfully for user: $username');
     } catch (e) {
       _logger.e('Error saving JWT token for user: $username, Error: $e');
-      throw AppError.tokenSaveError(e);
+      throw AppError.userError();
     }
   }
 
+  /// the SSO authentication method for all Users
+  ///
+  /// This method takes a [context] and [ref] and sends a POST request to the server.
+  /// The server will respond with a JWT token that will be saved in the cookie jar.
+  ///
+  /// Throws an [AppError] if a network error occurs or if the gRPC call fails.
   static Future<void> ssoAuth(BuildContext context, WidgetRef ref) async {
-    final viewModel = ref.watch(userViewModelProvider.notifier);
+    final viewModel = ref.read(userViewModelProvider.notifier);
     _logger.i('Starting SSO authentication');
-    //viewModel.current.value.setIsLoading(true);
-    await Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) => Scaffold(
-          appBar: AppBar(
-            title: const Text('TUM Web Login'),
-            leading: IconButton(
-              icon: const Icon(Icons.arrow_back_ios_new_sharp),
-              onPressed: () {
-                Navigator.pushNamed(context, '/home');
-                viewModel.current.value.setIsLoading(false);
-              },
+    viewModel.setLoading(true); // Set loading state
+    try {
+      await navigatorKey.currentState?.push(
+        MaterialPageRoute(
+          builder: (context) => Scaffold(
+            appBar: AppBar(
+              title: const Text('TUM Web Login'),
+              leading: IconButton(
+                icon: const Icon(Icons.arrow_back_ios_new_sharp),
+                onPressed: () {
+                  viewModel.setLoading(
+                    false,
+                  ); // Reset loading state after WebView is closed
+                  navigatorKey.currentState?.pushReplacementNamed('/welcome');
+                },
+              ),
             ),
+            body: _buildWebView(),
           ),
-          body: _buildWebView(),
         ),
-      ),
-    );
-    isLoginSuccessful = false; // Reset the flag after WebView is closed
+      );
+    } catch (e) {
+      _logger.e('Error during SSO authentication');
+      viewModel
+          .setLoading(false); // Reset loading state after WebView is closed
+    }
   }
 
+  ///Helper method to build the web view for SSO authentication
   static Widget _buildWebView() {
+    _logger.i('Building web view');
     return webview.InAppWebView(
       initialUrlRequest: webview.URLRequest(url: Uri.parse(Routes.ssoLogin)),
       onLoadStop: _onWebViewLoadStop,
     );
   }
 
+  ///Helper method to handle the web view load stop event
   static Future<void> _onWebViewLoadStop(
     webview.InAppWebViewController controller,
     Uri? url,
@@ -110,25 +127,26 @@ class AuthHandler {
         // Due to the token being signed from TUM Live RBG, the app will not be able to decode it
         // Therefor can´t retrieve the user data from TUM database
         // Once the API for user is implemented and deployed, this will be adapted to redirect to the course_overview_view
-        navigatorKey.currentState
-            ?.pop(); //Comment this line if you want to continue in the webview
+        navigatorKey.currentState?.pushReplacementNamed('/welcome');
         _logger.i('SSO authentication completed, redirected to app');
       } else if (url != null) {
-        _logger.d('Web view loaded URL: $url');
+        _logger.i('Web view loaded URL: $url');
       } else {
-        _logger.w('URL is null in web view onLoadStop');
+        _logger.e('URL is null in web view onLoadStop');
       }
     } catch (e) {
       _logger.e('Error during SSO authentication: $e');
-      throw AppError.networkError(e);
+      throw AppError.userError();
     }
   }
 
+  ///Helper method to handle the cookie retrieval
+  ///
+  /// This method takes a [url] and retrieves the JWT token from the cookies.
   static Future<void> _handleCookieRetrieval(Uri url) async {
     try {
       final cookieManager = webview.CookieManager.instance();
       List<webview.Cookie> cookies = await cookieManager.getCookies(url: url);
-      _logger.d('Retrieved cookies from URL: $url');
       webview.Cookie? jwtCookie;
       for (var cookie in cookies) {
         if (cookie.name == 'jwt') {
@@ -137,7 +155,7 @@ class AuthHandler {
         }
       }
       if (jwtCookie != null) {
-        await TokenHandler.saveToken(
+        await TokenHandler.saveTokenFromCookies(
           'jwt',
           [Cookie(jwtCookie.name, jwtCookie.value)],
         );
diff --git a/lib/base/networking/api/handler/bookmarks_handler.dart b/lib/base/networking/api/handler/bookmarks_handler.dart
new file mode 100644
index 00000000..40fcf008
--- /dev/null
+++ b/lib/base/networking/api/handler/bookmarks_handler.dart
@@ -0,0 +1,116 @@
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:logger/logger.dart';
+
+import 'grpc_handler.dart';
+
+class BooKMarkHandler {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  BooKMarkHandler(this._grpcHandler);
+
+  /// Fetches user bookmarks.
+  ///
+  /// This method sends a `getUserBookmarks` gRPC call to fetch the user's bookmarks.
+  ///
+  /// returns a [List<Bookmark>] instance that represents the user's bookmarks.
+  Future<List<Bookmark>> fetchUserBookmarks() async {
+    _logger.i('Fetching user bookmarks');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.getUserBookmarks(GetBookmarksRequest());
+        _logger.d('User bookmarks: ${response.bookmarks}');
+        return response.bookmarks;
+      },
+    );
+  }
+
+
+  /// Adds a bookmark for the current user.
+  ///
+  /// Sends a `putUserBookmark` gRPC call with the given [bookmarkData] to add a bookmark.
+  /// Logs the action of adding and provides details of the added bookmark.
+  ///
+  /// [bookmarkData]: The data of the bookmark to be added, encapsulated in a `BookmarkData` object.
+  ///
+  /// returns [Bookmark]: The `Bookmark` instance representing the added bookmark.
+  Future<Bookmark> addToBookmark(BookmarkData bookmarkData) async {
+    var request = PutBookmarkRequest(
+      description: bookmarkData.description,
+      hours: bookmarkData.hours,
+      minutes: bookmarkData.minutes,
+      seconds: bookmarkData.seconds,
+      streamID: bookmarkData.streamID,
+    );
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.putUserBookmark(request);
+        _logger.d('User bookmark: ${response.bookmark}');
+        return response.bookmark;
+      },
+    );
+  }
+
+  Future<bool> removeFromBookmarks(int bookmarkID) async {
+    var request = DeleteBookmarkRequest(bookmarkID: bookmarkID);
+    try {
+      await _grpcHandler.callGrpcMethod(
+        (client) async {
+          await client.deleteUserBookmark(request);
+        },
+      );
+      _logger.i('User bookmark removed successfully');
+      return true;
+    } catch (e) {
+      _logger.e('Error removing bookmark: $e');
+      return false;
+    }
+  }
+
+  /// Updates a bookmark for the current user.
+  ///
+  /// Sends a `patchUserBookmark` gRPC call with the given [bookmarkData] to update a bookmark.
+  /// Logs the action of updating and provides details of the updated bookmark.
+  ///
+  /// [bookmarkData]: The data of the bookmark to be updated, encapsulated in a `BookmarkData` object.
+  ///
+  /// returns [Bookmark]: The `Bookmark` instance representing the updated bookmark.
+  Future<Bookmark> updateBookmark(
+    int bookmarkID,
+    BookmarkData bookmarkData,
+  ) async {
+    var request = PatchBookmarkRequest(
+      bookmarkID: bookmarkID,
+      description: bookmarkData.description,
+      hours: bookmarkData.hours,
+      minutes: bookmarkData.minutes,
+      seconds: bookmarkData.seconds,
+    );
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.patchUserBookmark(request);
+        _logger.d('User bookmark: ${response.bookmark}');
+        return response.bookmark;
+      },
+    );
+  }
+}
+
+// Purpose: Encapsulates the data for a bookmark.
+//
+// This class is used to store the data for a bookmark.
+class BookmarkData {
+  final String description;
+  final int hours;
+  final int minutes;
+  final int seconds;
+  final int streamID;
+
+  BookmarkData({
+    required this.description,
+    required this.hours,
+    required this.minutes,
+    required this.seconds,
+    required this.streamID,
+  });
+}
diff --git a/lib/base/networking/api/handler/chat_handler.dart b/lib/base/networking/api/handler/chat_handler.dart
new file mode 100644
index 00000000..2ceeb49a
--- /dev/null
+++ b/lib/base/networking/api/handler/chat_handler.dart
@@ -0,0 +1,159 @@
+import 'dart:async';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:logger/logger.dart';
+
+class ChatHandlers {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  ChatHandlers(this._grpcHandler);
+
+  /// Fetches user chats.
+  ///
+  /// This method sends a `getUserChats` gRPC call to fetch the user's chats.
+  /// Takes a [streamID] parameter to fetch the user's chats for a specific stream.
+  /// returns a [List<Chat>] instance that represents the user's chats.
+  Future<List<ChatMessage>> getChatMessages(int streamID) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        _logger.i('Fetching chat messages');
+        final response = await client
+            .getChatMessages(GetChatMessagesRequest(streamID: streamID));
+        _logger.d('Chat messages: ${response.messages}');
+        return response.messages;
+      },
+    );
+  }
+
+  /// Post a chat message.
+  ///
+  /// This method sends a `postChatMessage` gRPC call to post a chat message.
+  /// Takes a [streamID] parameter to post a chat message for a specific stream.
+  /// Takes a [message] parameter to post a chat message.
+  ///
+  /// returns a [ChatMessage] instance that represents the posted chat message.
+  Future<ChatMessage> postChatMessage(int streamID, String message) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.postChatMessage(
+          PostChatMessageRequest(
+            streamID: streamID,
+            message: message,
+          ),
+        );
+        _logger.i('Chat message posted: ${response.message}');
+        return response.message;
+      },
+    );
+  }
+
+  /// Post a message Reaction.
+  ///
+  /// This method sends a `postChatReaction` gRPC call to post a chat reaction.
+  /// Takes a [messageID] parameter to post a chat reaction for a specific message.
+  /// Takes a [streamID] parameter to post a chat reaction for a specific stream.
+  /// Takes a [emoji] parameter to post a chat reaction.
+  ///
+  /// returns a [ChatReaction] instance that represents the posted chat reaction.
+  Future<ChatReaction> postMessageReaction(int messageID,
+      int streamID,
+      String emoji,) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.postChatReaction(
+          PostChatReactionRequest(
+            emoji: emoji,
+            streamID: streamID,
+            chatID: messageID,
+          ),
+        );
+        _logger.i('Chat reaction ${response.reaction} posted');
+        return response.reaction;
+      },
+    );
+  }
+
+  /// Delete a message Reaction.
+  ///
+  /// This method sends a `deleteChatReaction` gRPC call to delete a chat reaction.
+  /// Takes a [messageID] parameter to delete a chat reaction for a specific message.
+  /// Takes a [streamID] parameter to delete a chat reaction for a specific stream.
+  /// Takes a [reactionID] parameter to delete a chat reaction.
+  Future<void> deleteMessageReaction(int messageID,
+      int streamID,
+      int reactionID,) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.deleteChatReaction(
+          DeleteChatReactionRequest(
+            chatID: messageID,
+            streamID: streamID,
+            reactionID: reactionID,
+          ),
+        );
+        _logger.i('Chat reaction deleted');
+      },
+    );
+  }
+
+  /// Post a chat reply.
+  ///
+  /// This method sends a `postChatReply` gRPC call to post a chat reply.
+  /// Takes a [messageID] parameter to post a chat reply for a specific message.
+  /// Takes a [streamID] parameter to post a chat reply for a specific stream.
+  /// Takes a [message] parameter to post a chat reply.
+  ///
+  /// returns a [ChatMessage] instance that represents the posted chat reply.
+  Future<ChatMessage> postChatReply(int messageID,
+      int streamID,
+      String message,) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.postChatReply(
+          PostChatReplyRequest(
+            chatID: messageID,
+            streamID: streamID,
+            message: message,
+          ),
+        );
+        _logger.i('Chat reply ${response.reply} posted');
+        return response.reply;
+      },
+    );
+  }
+
+  /// Mark the Chat as resolved.
+  ///
+  /// This method sends a `markChatMessageAsResolved` gRPC call to mark the chat as resolved.
+  /// Takes a [messageID] parameter to mark the chat as resolved for a specific message.
+  /// Takes a [streamID] parameter to mark the chat as resolved for a specific stream.
+  Future<void> markChatMessageAsResolved(int messageID, int streamID) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.markChatMessageAsResolved(
+          MarkChatMessageAsResolvedRequest(
+            chatID: messageID,
+            streamID: streamID,
+          ),
+        );
+        _logger.i('Chat message marked as resolved');
+      },
+    );
+  }
+
+  Future<void> markChatMessageAsUnresolved(int messageID, int streamID) async {
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.markChatMessageAsUnresolved(
+          MarkChatMessageAsUnresolvedRequest(
+            chatID: messageID,
+            streamID: streamID,
+          ),
+        );
+        _logger.i('Chat message marked as unresolved');
+      },
+    );
+  }
+
+}
\ No newline at end of file
diff --git a/lib/base/networking/api/handler/course_handler.dart b/lib/base/networking/api/handler/course_handler.dart
new file mode 100644
index 00000000..10b1e4d1
--- /dev/null
+++ b/lib/base/networking/api/handler/course_handler.dart
@@ -0,0 +1,47 @@
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/user_handler.dart';
+import 'package:logger/logger.dart';
+import 'package:tuple/tuple.dart';
+
+
+class CourseHandler {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  CourseHandler(this._grpcHandler);
+
+  /// Fetches the public courses.
+  Future<List<Course>> fetchPublicCourses() async {
+    _logger.i('Fetching public courses');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response =
+            await client.getPublicCourses(GetPublicCoursesRequest());
+        _logger.d('Public courses: ${response.courses}');
+        return response.courses;
+      },
+    );
+  }
+/// fetches the semesters and the current semester.
+  Future<Tuple2<List<Semester>, Semester>> fetchSemesters() async {
+    _logger.i('Fetching semesters');
+    final response = await _grpcHandler.callGrpcMethod(
+      (client) async {
+        return await client.getSemesters(GetSemestersRequest());
+      },
+    );
+    _logger.i('Semesters: ${response.semesters}');
+    _logger.i('Current Semester: ${response.current}');
+    return Tuple2(response.semesters, response.current);
+  }
+
+  /// Fetches all the courses. (public + user)
+  Future<List<Course>> fetchAllCourses() async {
+    List<Course> userCourses =
+        await UserHandler(_grpcHandler).fetchUserCourses();
+    List<Course> publicCourses =
+        await CourseHandler(_grpcHandler).fetchPublicCourses();
+    return [...userCourses, ...publicCourses];
+  }
+}
diff --git a/lib/base/networking/api/handler/grpc_handler.dart b/lib/base/networking/api/handler/grpc_handler.dart
index 7038e349..89ec8f9f 100644
--- a/lib/base/networking/api/handler/grpc_handler.dart
+++ b/lib/base/networking/api/handler/grpc_handler.dart
@@ -19,11 +19,10 @@ class GrpcHandler {
   /// The [host] and [port] are required.
   GrpcHandler(this.host, this.port) {
     _logger.i('Creating GrpcHandler: Connecting to gRPC server at $host:$port');
-
     _channel = ClientChannel(
       host,
       port: port,
-      options: const ChannelOptions(credentials: ChannelCredentials.insecure()),
+      options: const ChannelOptions(credentials: ChannelCredentials.secure()),
     );
   }
 
@@ -44,26 +43,34 @@ class GrpcHandler {
   ) async {
     _logger.d('callGrpcMethod: Initiating gRPC call');
     try {
-      String token = await TokenHandler.loadToken('jwt');
-      final metadata = <String, String>{
-        'grpcgateway-cookie': 'jwt=$token',
-      };
-
-      final callOptions = CallOptions(metadata: metadata);
-
+      String token = '';
+      try {
+        token = await TokenHandler.loadToken('jwt');
+      }catch(e) {
+        token = '';
+      }
+      CallOptions callOptions;
+      if(token.isNotEmpty) {
+        final metadata = <String, String>{
+          'grpcgateway-cookie': 'jwt=$token',
+        };
+         callOptions = CallOptions(metadata: metadata);
+      }else {
+         callOptions = CallOptions();
+      }
       return await grpcMethod(APIClient(_channel, options: callOptions));
     } on SocketException catch (socketException) {
       _logger
           .e('SocketException in callGrpcMethod: ${socketException.message}');
       throw AppError.networkError(socketException.message);
-    } catch (error) {
-      _logger.e('Error in callGrpcMethod: $error');
-      if (error is GrpcError) {
-        _logger.e('gRPC error: ${error.code}, ${error.message}');
-        throw mapGrpcErrorToAppError(error);
+    } catch (e) {
+      _logger.e('Error in callGrpcMethod: $e');
+      if (e is GrpcError) {
+        _logger.e('gRPC error: ${e.code}, ${e.message}');
+        throw mapGrpcErrorToAppError(e);
       } else {
-        _logger.e('Unknown error: $error');
-        throw AppError.networkError(error);
+        _logger.e('Unknown error: $e');
+        throw AppError.networkError(e);
       }
     }
   }
@@ -82,6 +89,8 @@ class GrpcHandler {
         return AppError.forbidden();
       case StatusCode.notFound:
         return AppError.notFound();
+      case StatusCode.alreadyExists:
+        return AppError.conflictError();
       case StatusCode.internal:
         return AppError.internalServerError();
       case StatusCode.unimplemented:
diff --git a/lib/base/networking/api/handler/notification_handler.dart b/lib/base/networking/api/handler/notification_handler.dart
new file mode 100644
index 00000000..fef88428
--- /dev/null
+++ b/lib/base/networking/api/handler/notification_handler.dart
@@ -0,0 +1,74 @@
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:logger/logger.dart';
+
+class NotificationHandler {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  NotificationHandler(this._grpcHandler);
+
+  /// Registers a new device for push notificaitons.
+  ///
+  /// This method sends a `postDeviceToken` gRPC call to update the user's
+  /// active device token list.
+  Future<void> postDeviceToken(String deviceToken) async {
+    _logger.i('Posting device token');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client
+            .postDeviceToken(PostDeviceTokenRequest(deviceToken: deviceToken));
+        _logger.i('Device token posted successfully');
+      },
+    );
+  }
+
+  /// Remove a device for push notificaitons.
+  ///
+  /// This method sends a `deleteDeviceToken` gRPC call to delete this device's
+  /// the user's token from the user's active device token list.
+  Future<void> deleteDeviceToken(String deviceToken) async {
+    _logger.i('Deleting device token');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.deleteDeviceToken(
+          DeleteDeviceTokenRequest(deviceToken: deviceToken),
+        );
+        _logger.i('Device token deleted successfully');
+      },
+    );
+  }
+
+  /// Fetches featured notifications.
+  ///
+  /// This method sends a `getFeatureNotifications` gRPC call to fetch the featured notifications.
+  ///
+  /// returns a [List<Notification>] instance that represents the feature notifications.
+  Future<List<FeatureNotification>> fetchFeatureNotifications() async {
+    _logger.i('Fetching feature notifications');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client
+            .getFeatureNotifications(GetFeatureNotificationsRequest());
+        _logger.d('Feature notifications: ${response.featureNotifications}');
+        return response.featureNotifications;
+      },
+    );
+  }
+
+  /// Fetches Banner Alerts.
+  ///
+  /// This method sends a `getBannerAlerts` gRPC call to fetch the banner alerts.
+  ///
+  /// returns a [List<BannerAlert>] instance that represents the banner alerts.
+  Future<List<BannerAlert>> fetchBannerAlerts() async {
+    _logger.i('Fetching banner alerts');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.getBannerAlerts(GetBannerAlertsRequest());
+        _logger.d('Banner alerts: ${response.bannerAlerts}');
+        return response.bannerAlerts;
+      },
+    );
+  }
+}
diff --git a/lib/base/networking/api/handler/pinned_handler.dart b/lib/base/networking/api/handler/pinned_handler.dart
new file mode 100644
index 00000000..f4da402a
--- /dev/null
+++ b/lib/base/networking/api/handler/pinned_handler.dart
@@ -0,0 +1,77 @@
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:logger/logger.dart';
+import 'grpc_handler.dart';
+
+class PinnedHandler {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  PinnedHandler(this._grpcHandler);
+
+  /// Fetches the current user's pinned courses.
+  ///
+  /// This method sends a `getUserPinned` gRPC call to fetch the user's pinned
+  ///  courses.
+  ///
+  /// Returns a [List<Course>] instance that represents the user's pinned
+  /// courses.
+  Future<List<Course>> fetchUserPinned() async {
+    _logger.i('Fetching user pinned');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.getUserPinned(GetUserPinnedRequest());
+        _logger.d('User pinned: ${response.courses}');
+        return response.courses;
+      },
+    );
+  }
+
+  /// Pins a course by its ID.
+  ///
+  /// Sends a gRPC call to pin the specified course. Logs the action of pinning
+  /// and successful completion of the operation.
+  ///
+  /// [courseID]: The unique identifier of the course to be pinned.
+  ///
+  /// Returns [bool]: `true` if the course was pinned successfully, `false` otherwise.
+  Future<bool> pinCourse(int courseID) async {
+    _logger.i('Pinning course with id: $courseID');
+    try {
+      await _grpcHandler.callGrpcMethod(
+        (client) async {
+          await client.postUserPinned(PostPinnedRequest(courseID: courseID));
+        },
+      );
+      _logger.i('Course pinned successfully');
+      return true;
+    } catch (e) {
+      _logger.e('Error pinning course: $e');
+      return false;
+    }
+  }
+
+  /// Unpins a course by its ID.
+  ///
+  /// Sends a gRPC call to unpin the specified course. Logs the action of unpinning
+  /// and successful completion of the operation.
+  ///
+  /// [courseID]: The unique identifier of the course to be unpinned.
+  ///
+  /// returns [bool]: `true` if the course was unpinned successfully, `false` otherwise.
+  Future<bool> unpinCourse(int courseID) async {
+    _logger.i('Unpinning course with id: $courseID');
+    try {
+      await _grpcHandler.callGrpcMethod(
+        (client) async {
+          await client
+              .deleteUserPinned(DeletePinnedRequest(courseID: courseID));
+        },
+      );
+      _logger.i('Course unpinned successfully');
+      return true;
+    } catch (e) {
+      _logger.e('Error unpinning course: $e');
+      return false;
+    }
+  }
+}
diff --git a/lib/base/networking/api/handler/poll_handler.dart b/lib/base/networking/api/handler/poll_handler.dart
new file mode 100644
index 00000000..c43393c9
--- /dev/null
+++ b/lib/base/networking/api/handler/poll_handler.dart
@@ -0,0 +1,53 @@
+import 'dart:async';
+
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:logger/logger.dart';
+
+class PollHandlers {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  PollHandlers(this._grpcHandler);
+
+  /// Fetches polls for a stream.
+  ///
+  /// This method sends a `getPolls` gRPC call to fetch the polls for a stream.
+  /// Takes a [streamID] parameter to fetch the polls for a specific stream.
+  ///
+  /// returns a [List<Poll>] instance that represents the polls for a stream.
+  Future<List<Poll>> getPolls(int streamID) async {
+    _logger.i('Fetching polls for streamID: $streamID');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response =
+            await client.getPolls(GetPollsRequest(streamID: streamID));
+        _logger.d('Polls fetched: ${response.polls}');
+        return response.polls;
+      },
+    );
+  }
+
+  /// Post a poll vote.
+  ///
+  /// This method sends a `postPollVote` gRPC call to post a poll vote.
+  /// Takes a [streamID] parameter to post a poll vote for a specific stream.
+  /// Takes a [pollOptionID] parameter to post a poll vote for a specific poll option.
+  Future<void> postPollVote(int streamID, int pollOptionID) async {
+    _logger.i(
+      'Posting poll vote for streamID: $streamID, pollOptionID: $pollOptionID',
+    );
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.postPollVote(PostPollVoteRequest(
+            streamID: streamID,
+            pollOptionID: pollOptionID,
+          ),
+        );
+        _logger.i(
+          'Poll vote posted successfully for option $pollOptionID in stream $streamID',
+        );
+      },
+    );
+  }
+}
diff --git a/lib/base/networking/api/handler/settings_handler.dart b/lib/base/networking/api/handler/settings_handler.dart
new file mode 100644
index 00000000..81748a51
--- /dev/null
+++ b/lib/base/networking/api/handler/settings_handler.dart
@@ -0,0 +1,171 @@
+import 'dart:convert';
+
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:logger/logger.dart';
+
+import 'grpc_handler.dart';
+
+
+class SettingsHandler {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  SettingsHandler(this._grpcHandler);
+
+  /// Fetches the user settings.
+  ///
+  /// This method sends a `getUserSettings` gRPC call to fetch the user's settings from the server.
+  ///
+  /// Returns a [List] of [UserSetting]s.
+  Future<List<UserSetting>> fetchUserSettings() async {
+    try {
+      _logger.i('Fetching user settings');
+      final response = await _grpcHandler.callGrpcMethod(
+        (client) async {
+          final response =
+              await client.getUserSettings(GetUserSettingsRequest());
+          _logger.i('User settings fetched successfully');
+          _logger.d('User settings: ${response.userSettings}');
+          return response.userSettings;
+        },
+      );
+      return response;
+    } catch (e) {
+      _logger.e(e);
+      rethrow;
+    }
+  }
+
+  /// Updates the user settings.
+  ///
+  /// This method sends a `patchUserSettings` gRPC call to update the user's settings on the server.
+  ///   * [updatedSettings] - The updated settings.
+  /// Returns `true` if the update was successful.
+  Future<bool> updateUserSettings(List<UserSetting> updatedSettings) async {
+    try {
+      _logger.i('Updating user settings');
+      final request = PatchUserSettingsRequest()
+        ..userSettings.addAll(updatedSettings);
+      await _grpcHandler.callGrpcMethod(
+        (client) async {
+          await client.patchUserSettings(request);
+          _logger.i('User settings updated successfully');
+        },
+      );
+      return true;
+    } catch (e) {
+      _logger.e('Error updating user settings: $e');
+      return false;
+    }
+  }
+
+  /// Updates the user's preferred name.
+  ///
+  /// This method sends a `patchUserSettings` gRPC call to update the user's preferred name on the server.
+  ///   * [newName] - The new preferred name.
+  /// Returns `true` if the update was successful.
+  Future<void> updatePreferredName(String newName) async {
+    try {
+      _logger.i('Updating user settings...');
+      final request = PatchUserSettingsRequest()
+        ..userSettings.add(
+          UserSetting(type: UserSettingType.PREFERRED_NAME, value: newName),
+        );
+      await _grpcHandler.callGrpcMethod(
+        (client) async {
+          await client.patchUserSettings(request);
+          _logger.i('User settings updated successfully');
+        },
+      );
+    } catch (e) {
+      _logger.e('Error updating user settings: $e');
+      rethrow;
+    }
+  }
+
+  /// Updates the user's preferred greeting.
+  ///
+  /// This method sends a `patchUserSettings` gRPC call to update the user's preferred greeting on the server.
+  ///  * [newGreeting] - The new preferred greeting.
+  ///  Returns `true` if the update was successful.
+  Future<bool> updateGreeting(String newGreeting) async {
+    try {
+      _logger.i('Updating user settings...');
+      final request = PatchUserSettingsRequest()
+        ..userSettings.add(
+          UserSetting(type: UserSettingType.GREETING, value: newGreeting),
+        );
+
+      await _grpcHandler.callGrpcMethod(
+        (client) async {
+          await client.patchUserSettings(request);
+          _logger.i('User settings updated successfully');
+        },
+      );
+      return true;
+    } catch (e) {
+      _logger.e('Error updating user settings: $e');
+      return false;
+    }
+  }
+
+  /// Parses playback speeds from the user settings.
+  ///
+  /// This method parses the playback speeds from the user settings and returns them as a [List] of [double]s.
+  ///  * [userSettings] - The user settings.
+  ///  Returns a [List] of [double]s.
+  List<double> parsePlaybackSpeeds(List<UserSetting>? userSettings) {
+    final playbackSpeedSetting = userSettings?.firstWhere(
+      (setting) => setting.type == UserSettingType.CUSTOM_PLAYBACK_SPEEDS,
+      orElse: () => UserSetting(value: jsonEncode([])),
+    );
+
+    if (playbackSpeedSetting != null && playbackSpeedSetting.value.isNotEmpty) {
+      try {
+        final List<dynamic> speedsJson = jsonDecode(playbackSpeedSetting.value);
+        var sortedSpeeds = speedsJson
+            .where((item) => item['enabled'] == true)
+            .map((item) => double.parse(item['speed'].toString()))
+            .toList();
+        sortedSpeeds.sort();
+        return sortedSpeeds;
+      } catch (e) {
+        _logger.e('Error parsing playback speeds: $e');
+        return [];
+      }
+    }
+    return [];
+  }
+
+  /// Updates the selected speeds in user settings.
+  ///
+  /// This method updates the selected speeds in user settings and sends a `patchUserSettings` gRPC call to update the user's settings on the server.
+  /// * [speed] - The speed to update.
+  /// * [isSelected] - Whether the speed is selected or not.
+  /// * [currentSettings] - The current user settings.
+  /// Returns `true` if the update was successful.
+  Future<void> updateSelectedSpeeds(
+    double speed,
+    bool isSelected,
+    List<UserSetting> currentSettings,
+  ) async {
+    var playbackSpeedSetting = currentSettings.firstWhere(
+      (setting) => setting.type == UserSettingType.CUSTOM_PLAYBACK_SPEEDS,
+      orElse: () => UserSetting(
+        type: UserSettingType.CUSTOM_PLAYBACK_SPEEDS,
+        value: jsonEncode([
+          {"speed": 1.0, "enabled": true},
+        ]),
+      ),
+    );
+    var speeds = (jsonDecode(playbackSpeedSetting.value) as List)
+        .map((e) => e["speed"])
+        .toSet();
+    isSelected ? speeds.add(speed) : speeds.remove(speed);
+    speeds.add(1.0); // Ensure default speed is always included
+    playbackSpeedSetting.value = jsonEncode(
+      speeds.map((s) => {"speed": s, "enabled": true}).toList(),
+    );
+    await updateUserSettings([playbackSpeedSetting]);
+  }
+}
diff --git a/lib/base/networking/api/handler/stream_handler.dart b/lib/base/networking/api/handler/stream_handler.dart
new file mode 100644
index 00000000..8504b02d
--- /dev/null
+++ b/lib/base/networking/api/handler/stream_handler.dart
@@ -0,0 +1,160 @@
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:logger/logger.dart';
+
+class StreamHandler {
+  static final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  StreamHandler(this._grpcHandler);
+
+  /// Fetches the current course streams.
+  ///
+  /// This method sends a `getUserStreams` gRPC call to fetch the user's
+  /// streams.
+  ///
+  /// Takes [courseID] as a parameter.
+  /// Returns a [List<Stream>] instance that represents the user's streams.
+  Future<List<Stream>> fetchCourseStreams(int courseID) async {
+    _logger.i('Fetching streams');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client
+            .getCourseStreams(GetCourseStreamsRequest(courseID: courseID));
+        _logger.d('Streams: ${response.streams}');
+        return response.streams;
+      },
+    );
+  }
+
+  /// Fetches the stream of the course.
+  ///
+  /// This method sends a `getStream` gRPC call to fetch the stream of the course.
+  ///
+  /// Takes [streamId] as a parameter.
+  ///
+  /// Returns a [Stream] instance that represents the stream of the course.
+  Future<Stream> fetchStream(streamId) async {
+    _logger.i('Fetching stream');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response =
+            await client.getStream(GetStreamRequest(streamID: (streamId)));
+        _logger.d('Stream: ${response.stream}');
+        return response.stream;
+      },
+    );
+  }
+
+  /// fetches the live now streams
+  ///
+  /// This method sends a `getNowLive` gRPC call to fetch the live now streams.
+  ///
+  /// Returns a [List<Stream>] instance that represents the live now streams.
+  Future<List<Stream>> fetchLiveNowStreams() async {
+    _logger.i('Fetching live now stream');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.getNowLive(GetNowLiveRequest());
+        _logger.d('Live now stream: ${response.stream}');
+        return response.stream;
+      },
+    );
+  }
+
+  /// Fetches the thumbnail stream.
+  ///
+  /// This method sends a `getThumbsLive` gRPC call to fetch the thumbnail stream.
+  ///
+  /// Takes [streamId] as a parameter.
+  /// Returns a [String] instance that represents the thumbnail stream.
+  Future<String> fetchThumbnailStreams(int streamId) async {
+    _logger.i('Fetching thumbnail stream');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client
+            .getThumbsLive(GetThumbsLiveRequest(streamID: streamId));
+        _logger.d('Thumbnail stream: ${response.path}');
+        return response.path;
+      },
+    );
+  }
+
+  /// Fetches the thumbnail VOD.
+  ///
+  /// This method sends a `getThumbsVOD` gRPC call to fetch the thumbnail VOD.
+  ///
+  /// Takes [streamId] as a parameter.
+  /// Returns a [String] instance that represents the thumbnail VOD.
+  Future<String> fetchThumbnailVOD(int streamId) async {
+    _logger.i('Fetching thumbnail VOD');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response =
+            await client.getThumbsVOD(GetThumbsVODRequest(streamID: streamId));
+        _logger.d('Thumbnail VOD: ${response.path}');
+        return response.path;
+      },
+    );
+  }
+
+  /// Fetches the progress of a stream.
+  ///
+  /// This method sends a `getProgress` gRPC call to fetch the progress of a stream.
+  ///
+  /// Takes [streamId] as a parameter.
+  /// Returns a [Progress] instance that represents the progress of the stream.
+  Future<Progress> fetchProgress(int streamId) async {
+    _logger.i('Fetching progress');
+    try {
+      return _grpcHandler.callGrpcMethod(
+        (client) async {
+          final response =
+              await client.getProgress(GetProgressRequest(streamID: streamId));
+
+          _logger.i('Progress: ${response.progress}');
+          return response.progress;
+        },
+      );
+    } catch (e) {
+      _logger.e('Progress not found, returning default value');
+      return Progress(progress: 0.0);
+    }
+  }
+
+  /// Updates the progress of a stream.
+  ///
+  /// This method sends a `putProgress` gRPC call to update the progress of a stream.
+  ///
+  /// Takes [streamId] and [progress] as parameters.
+  Future<void> putProgress(streamId, Progress progress) async {
+    _logger.i('Updating progress');
+    await _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.putProgress(
+          PutProgressRequest(
+            streamID: streamId,
+            progress: progress.progress,
+          ),
+        );
+        _logger.d('Progress updated');
+      },
+    );
+  }
+
+  /// Marks a stream as watched.
+  ///
+  /// This method sends a `markAsWatched` gRPC call to mark a stream as watched.
+  ///
+  /// Takes [streamId] as a parameter.
+
+  Future<void> markAsWatched(streamId) async {
+    _logger.i('Marking stream as watched');
+    await _grpcHandler.callGrpcMethod(
+      (client) async {
+        await client.markAsWatched(MarkAsWatchedRequest(streamID: streamId));
+        _logger.d('Stream marked as watched');
+      },
+    );
+  }
+}
diff --git a/lib/base/networking/api/handler/token_handler.dart b/lib/base/networking/api/handler/token_handler.dart
index 4ea0d67d..cf970fe8 100644
--- a/lib/base/networking/api/handler/token_handler.dart
+++ b/lib/base/networking/api/handler/token_handler.dart
@@ -12,14 +12,17 @@ class TokenHandler {
   static final Logger _logger = Logger();
   static const _storage = FlutterSecureStorage();
 
-  /// Stores a JWT token.
+  /// Stores a token.
   ///
-  /// This method saves a JWT token to shared preferences. The token is identified
+  /// This method saves a token to shared preferences. The token is identified
   /// by the given key and is extracted from the list of cookies.
   ///
   /// Throws an [AppError] with an authentication error message if no JWT token
   /// is found in the list of cookies.
-  static Future<void> saveToken(String key, List<Cookie> cookies) async {
+  static Future<void> saveTokenFromCookies(
+    String key,
+    List<Cookie> cookies,
+  ) async {
     for (var cookie in cookies) {
       if (cookie.name == key) {
         await _storage.write(key: key, value: cookie.value);
@@ -28,17 +31,29 @@ class TokenHandler {
       }
     }
     _logger.w("Token not found in cookies.");
-    // Handle error when no jwt cookie is found
     throw AppError.authenticationError();
   }
 
-  /// Retrieves a JWT token.
+  /// Stores a token.
   ///
-  /// This method loads a JWT token from shared preferences. The token is identified
-  /// by the given key.
+  /// This method saves a JWT token to shared preferences. The token is identified
+  /// by the given key and value.
   ///
   /// Throws an [AppError] with an authentication error message if no JWT token
-  /// is found in shared preferences.
+  /// is found in the list of cookies.
+  static Future<void> saveToken(String key, String value) async {
+    await _storage.write(key: key, value: value);
+    _logger.i('Token saved to secure storage: $value');
+    return;
+  }
+
+  /// Retrieves a token.
+  ///
+  /// This method loads a token from shared preferences. The token is identified
+  /// by the given key.
+  ///
+  /// Throws an [AppError] with an authentication error message if no token is
+  /// found in shared preferences.
   static Future<String> loadToken(String key) async {
     try {
       final token = await _storage.read(key: key);
@@ -54,4 +69,44 @@ class TokenHandler {
       throw AppError.authenticationError();
     }
   }
+
+  /// Retrieves a token.
+  ///
+  /// This method loads a token from shared preferences. The token is identified
+  /// by the given key.
+  ///
+  /// Throws an [AppError] with an authentication error message if no token is
+  /// found in shared preferences.
+  static Future<String> loadTokenNoException(String key) async {
+    try {
+      final token = await _storage.read(key: key);
+      if (token == null) {
+        _logger.w('Token not found for key: $key');
+        return "";
+      }
+
+      _logger.i('Token successfully loaded for key: $key');
+      return token;
+    } catch (e) {
+      _logger.e('Error loading token: $e');
+      return "";
+    }
+  }
+
+  /// Deletes a JWT token.
+  ///
+  /// This method deletes a JWT token from shared preferences. The token is identified
+  /// by the given key.
+  ///
+  /// Throws an [AppError] with an authentication error message if no JWT token
+  /// is found in shared preferences.
+  static Future<void> deleteToken(String key) async {
+    try {
+      await _storage.delete(key: key);
+      _logger.i('Token successfully deleted for key: $key');
+    } catch (e) {
+      _logger.e('Error deleting token: $e');
+      throw AppError.notFound();
+    }
+  }
 }
diff --git a/lib/base/networking/api/handler/user_handler.dart b/lib/base/networking/api/handler/user_handler.dart
index 3c2d35b1..16bf9795 100644
--- a/lib/base/networking/api/handler/user_handler.dart
+++ b/lib/base/networking/api/handler/user_handler.dart
@@ -17,20 +17,70 @@ class UserHandler {
 
   /// Fetches the current user and associated data.
   ///
-  /// This method sends a `getUser` gRPC call to fetch the user details. It deserializes the gRPC response into a [model.User] instance.
+  /// This method sends a `getUser` gRPC call to fetch the user details.
   ///
-  /// Returns a [model.User] instance that represents the user details.
+  /// Returns a [User] instance that represents the user details.
   Future<User> fetchUser() async {
     _logger.i('Fetching user details');
     return _grpcHandler.callGrpcMethod(
       (client) async {
-        // Make the gRPC call
         final response = await client.getUser(GetUserRequest());
-        _logger.i('User details fetched successfully');
-        // Deserialize the gRPC response into a User instance
         _logger.d('User details: ${response.user}');
         return response.user;
       },
     );
   }
+
+  /// Fetches the current user's courses.
+  ///
+  /// This method sends a `getUserCourses` gRPC call to fetch the user's
+  /// courses.
+  ///
+  /// Returns a [List<Course>] instance that represents the user's courses.
+  Future<List<Course>> fetchUserCourses() async {
+    _logger.i('Fetching user courses');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.getUserCourses(GetUserCoursesRequest());
+        _logger.d('User courses: ${response.courses}');
+        return response.courses;
+      },
+    );
+  }
+
+  /// Fetches the current user's admin courses.
+  ///
+  /// This method sends a `getUserAdminCourses` gRPC call to fetch the user's
+  /// admin courses.
+  ///
+  /// Returns a [List<Course>] instance that represents the user's admin courses.
+  Future<List<Course>> fetchUserAdminCourses() async {
+    _logger.i('Fetching user admin courses');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response =
+            await client.getUserAdminCourses(GetUserAdminRequest());
+        _logger.d('User admin courses: ${response.courses}');
+        return response.courses;
+      },
+    );
+  }
+
+  /// Fetches the current user's settings.
+  ///
+  /// This method sends a `getUserSettings` gRPC call to fetch the user's
+  /// settings.
+  ///
+  /// Returns a [List<UserSetting>] instance that represents the user's
+  /// settings.
+  Future<List<UserSetting>> fetchUserSettings() async {
+    _logger.i('Fetching user settings');
+    return _grpcHandler.callGrpcMethod(
+      (client) async {
+        final response = await client.getUserSettings(GetUserSettingsRequest());
+        _logger.d('User settings: ${response.userSettings}');
+        return response.userSettings;
+      },
+    );
+  }
 }
diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index 805b04f9..c984bc54 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 /// AppConfig - Defines the configuration for the application.
 class AppConfig {
   static const String appName = 'GoCast Mobile';
@@ -8,16 +6,7 @@ class AppConfig {
 
   AppConfig._(); // Private constructor
 
-  // Determine the root URL based on the platform
-  // Used for development only. Once the api is deployed, this can be ignored.
-  static String get _rootUrl {
-    if (Platform.isAndroid) {
-      return 'http://10.0.2.2:8081/api';
-    } else if (Platform.isIOS) {
-      return 'http://localhost:8081/api';
-    }
-    throw UnsupportedError('Unsupported platform');
-  }
+  static String get _rootUrl => 'https://1279.test.live.mm.rbg.tum.de';
 
   // Authentication URLs
   static String get basicAuthUrl =>
@@ -28,17 +17,14 @@ class AppConfig {
   static String get ssoRedirectUrl => 'https://live.rbg.tum.de';
 
   // gRPC routes
-  static String get grpcHost {
-    return Platform.isAndroid ? '10.0.2.2' : 'localhost';
-  }
+  static String get grpcHost => 'grpc-1279.test.live.mm.rbg.tum.de';
 
-  static const int grpcPort = 12544;
+  static const int grpcPort = 443;
 }
 
 /// Routes - Defines HTTP and gRPC routes for the application.
 class Routes {
   Routes._(); // Private constructor
-
   // HTTP routes
   static String get basicLogin => AppConfig.basicAuthUrl;
 
diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart
new file mode 100644
index 00000000..60fa2c5b
--- /dev/null
+++ b/lib/firebase_options.dart
@@ -0,0 +1,58 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      throw UnsupportedError(
+        'DefaultFirebaseOptions have not been configured for web - '
+        'you can reconfigure this by running the FlutterFire CLI again.',
+      );
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for macos - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.windows:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for windows - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyCCbpYL8mGCkRD0CZG7bv5WmaNZP67Yxto',
+    appId: '1:1098592064630:android:fa116290547c8adf03fb57',
+    messagingSenderId: '1098592064630',
+    projectId: 'ipraktikum-v1',
+    storageBucket: 'ipraktikum-v1.appspot.com',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyDx6M88HdUC4YfxZK8A4UxwM-AucYrpCe8',
+    appId: '1:1098592064630:ios:0e47f83fa095cedb03fb57',
+    messagingSenderId: '1098592064630',
+    projectId: 'ipraktikum-v1',
+    storageBucket: 'ipraktikum-v1.appspot.com',
+    iosBundleId: 'de.tum.cit.ase.ios2324.tum',
+  );
+}
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
new file mode 100644
index 00000000..08f51e1d
--- /dev/null
+++ b/lib/l10n/app_de.arb
@@ -0,0 +1,99 @@
+{
+  "language": "Deutsch",
+  "@language": {
+    "description": "Die aktuelle Sprache."
+  },
+  "my_courses": "Meine Kurse",
+  "public_courses": "Öffentliche Kurse",
+  "live_now": "Jetzt Live",
+  "pinned_courses": "Angeheftete Kurse",
+  "pinned_empty": "Sie haben keine angehefteten Kurse.",
+  "pin": "Anheften",
+  "unpin": "Lösen",
+  "pinned": "Angeheftet",
+  "downloads": "Heruntergeladen",
+  "download": "Herunterladen",
+  "notification": "Benachrichtigung",
+  "notifications": "Benachrichtigungen",
+  "no_downloaded_courses": "Sie haben keine Kurse heruntergeladen.",
+  "no_notifications_found": "Keine Benachrichtigungen gefunden.",
+  "banner_notification": "Banner-Benachrichtigung",
+  "recent_uploads": "Neueste Uploads",
+  "feature_notifications": "Feature Notifications",
+  "confirm_unpin_title": "Lösen Bestätigen",
+  "confirm_unpin_message": "Sind Sie sicher, dass Sie diesen Kurs lösen möchten?",
+  "newest_first": "Neueste Zuerst",
+  "oldest_first": "Älteste Zuerst",
+  "chat_is_hidden": "Chat ist versteckt",
+  "chat_is_disabled_for_this_lecture": "Chat ist für diese Vorlesung deaktiviert",
+  "combined_view": "Kombinierte Ansicht",
+  "camera_view": "Kameraansicht",
+  "presentation_view": "Präsentationsansicht",
+  "split_view": "Geteilte Ansicht",
+  "starting_download": "Download beginnt...",
+  "delete": "Löschen",
+  "confirm_delete": "Löschung Bestätigen",
+  "confirm_delete_message": "Sind Sie sicher, dass Sie diesen Download löschen möchten?",
+  "logout_title": "Abmelden",
+  "logout_message": "Möchten Sie alle Ihre Downloads löschen und sich abmelden?",
+  "yes": "Ja",
+  "no": "Nein",
+  "tum_login": "TUM-Login",
+  "continue_without": "Fortfahren ohne",
+  "use_an_internal_account": "Ein internes Konto verwenden",
+  "welcome_to_gocast": "Willkommen bei GoCast",
+  "your_lectures_on_the_go": "Ihre Vorlesungen unterwegs",
+  "type_a_message": "Eine Nachricht eingeben...",
+  "search": "Suchen",
+  "cancel": "Abbrechen",
+  "account_settings": "Kontoeinstellungen",
+  "settings": "Einstellungen",
+  "preferred_greeting": "Bevorzugte Begrüßung",
+  "push_notifications": "Push-Benachrichtigungen",
+  "choose_theme": "Thema Wählen",
+  "dark": "Dunkel",
+  "light": "Hell",
+  "system_default": "Systemstandard",
+  "download_over_wifi_only": "Nur über WLAN herunterladen",
+  "video_playback_speed": "Videowiedergabegeschwindigkeit",
+  "playback_speed": "Wiedergabegeschwindigkeit",
+  "add_custom_playback_speed": "Benutzerdefinierte Wiedergabegeschwindigkeit hinzufügen",
+  "custom_playback_speed": "Benutzerdefinierte Wiedergabegeschwindigkeit",
+  "logout": "Abmelden",
+  "more": "Mehr",
+  "about_us": "Über Uns",
+  "privacy_policy": "Datenschutzbestimmungen",
+  "terms_and_conditions": "Allgemeine Geschäftsbedingungen",
+  "no_courses_found": "Keine Kurse gefunden.",
+  "download_confirmation_title": "Download-Bestätigung",
+  "download_confirmation_message": "Sie nutzen mobile Daten. Möchten Sie das Video über mobile Daten herunterladen?",
+  "download_not_allowed": "Download nicht erlaubt",
+  "download_not_allowed_message": "Sie befinden sich derzeit in einem Mobilfunknetz. Das Video kann aufgrund Ihrer Einstellungen nicht über mobile Daten heruntergeladen werden.",
+  "auth_required_title": "Authentifizierung erforderlich",
+  "auth_required_message": "Bitte melden Sie sich an, um auf diese Funktion zuzugreifen.",
+  "add_custom_speed": "Benutzerdefinierte Geschwindigkeit hinzufügen",
+  "enter_speed": "Geschwindigkeit eingeben (z.B. 1.7)",
+  "add": "Hinzufügen",
+  "edit_profile": "Profil bearbeiten",
+  "preferred_name_saved": "Bevorzugter Name gespeichert: {name}",
+  "name_change_limitation": "Der bevorzugte Name kann nur alle 3 Monate geändert werden",
+  "error_occurred": "Ein Fehler ist aufgetreten",
+  "change_limitation_detail": "Sie können dies nur alle drei Monate ändern.",
+  "enter_preferred_name": "Geben Sie Ihren bevorzugten Namen ein",
+  "enter_preferred_name_prompt": "Bitte geben Sie einen bevorzugten Namen ein",
+  "preferred_name": "Bevorzugter Name",
+  "save": "Speichern",
+  "number_too_long": "Nummer ist zu lang",
+  "enter_number_between": "Bitte geben Sie eine Zahl zwischen\n0.25 und 2.0 ein",
+  "turn_on_notifications": "Benachrichtigungen einschalten?",
+  "notifications_description": "Erhalten Sie sofortige Updates zu Live-Vorlesungen, bevorstehenden Quizzen und wichtigen Ankündigungen. Verpassen Sie keinen Moment Ihrer akademischen Laufbahn.",
+  "enable_notifications": "Benachrichtigungen aktivieren",
+  "skip": "Überspringen",
+  "forgot_password": "Passwort vergessen?",
+  "username": "Benutzername",
+  "password": "Passwort",
+  "enter_your_password": "Geben Sie Ihr Passwort ein",
+  "home": "Startseite",
+  "language_selection": "Sprache",
+  "language_selection_description": "Wählen Sie Ihre bevorzugte Sprache aus"
+}
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
new file mode 100644
index 00000000..c5da5659
--- /dev/null
+++ b/lib/l10n/app_en.arb
@@ -0,0 +1,99 @@
+{
+  "language": "English",
+  "@language": {
+    "description": "The current language."
+  },
+  "my_courses": "My Courses",
+  "public_courses": "Public Courses",
+  "live_now": "Live Now",
+  "pinned_courses": "Pinned Courses",
+  "pinned_empty": "You have no pinned courses.",
+  "pin": "Pin",
+  "unpin": "Unpin",
+  "pinned": "Pinned",
+  "downloads": "Downloads",
+  "download": "Download",
+  "notification": "Notification",
+  "notifications": "Notifications",
+  "no_downloaded_courses": "You have no downloaded courses.",
+  "no_notifications_found": "No notifications found.",
+  "banner_notification": "Banner Alerts",
+  "recent_uploads": "Recent Uploads",
+  "feature_notifications": "Feature Notifications",
+  "confirm_unpin_title": "Confirm Unpin",
+  "confirm_unpin_message": "Are you sure you want to unpin this course?",
+  "newest_first": "Newest First",
+  "oldest_first": "Oldest First",
+  "chat_is_hidden": "Chat is hidden",
+  "chat_is_disabled_for_this_lecture": "Chat is disabled for this lecture",
+  "combined_view": "Combined View",
+  "camera_view": "Camera View",
+  "presentation_view": "Presentation View",
+  "split_view": "Split View",
+  "starting_download": "Starting download...",
+  "delete": "Delete",
+  "confirm_delete": "Confirm Deletion",
+  "confirm_delete_message": "Are you sure you want to delete this download?",
+  "logout_title": "Logout",
+  "logout_message": "Would you like to delete all your downloads and logout?",
+  "yes": "Yes",
+  "no": "No",
+  "tum_login": "TUM Login",
+  "continue_without": "Continue without",
+  "use_an_internal_account": "Use an internal account",
+  "welcome_to_gocast": "Welcome to GoCast",
+  "your_lectures_on_the_go": "Your Lectures on the Go",
+  "type_a_message": "Type a message...",
+  "search": "Search",
+  "cancel": "Cancel",
+  "account_settings": "Account Settings",
+  "settings": "Settings",
+  "preferred_greeting": "Preferred Greeting",
+  "push_notifications": "Push Notifications",
+  "choose_theme": "Choose Theme",
+  "dark": "Dark",
+  "light": "Light",
+  "system_default": "System Default",
+  "download_over_wifi_only": "Download over WiFi only",
+  "video_playback_speed": "Video Playback Speed",
+  "playback_speed": "Playback Speed",
+  "add_custom_playback_speed": "Add Custom Playback Speed",
+  "custom_playback_speed": "Custom Playback Speed",
+  "logout": "Logout",
+  "more": "More",
+  "about_us": "About Us",
+  "privacy_policy": "Privacy Policy",
+  "terms_and_conditions": "Terms and Conditions",
+  "no_courses_found": "No courses found.",
+  "download_confirmation_title": "Download Confirmation",
+  "download_confirmation_message": "You are on mobile data. Would you like to download the video over mobile data?",
+  "download_not_allowed": "Download not allowed",
+  "download_not_allowed_message":  "You are currently on mobile data. Video cannot be downloaded over mobile data due to your settings.",
+  "auth_required_title": "Authentication Required",
+  "auth_required_message": "You need to be authenticated to access this content.",
+  "add_custom_speed": "Add Custom Speed",
+  "enter_speed": "Enter speed (e.g., 1.7)",
+  "add": "Add",
+  "edit_profile": "Edit Profile",
+  "preferred_name_saved": "Preferred name saved: {name}",
+  "name_change_limitation": "Preferred name can only be changed every 3 months",
+  "error_occurred": "An error occurred",
+  "change_limitation_detail": "You can change this once every three months.",
+  "enter_preferred_name": "Enter your preferred name",
+  "enter_preferred_name_prompt": "Please enter a preferred name",
+  "preferred_name": "Preferred Name",
+  "save": "Save",
+  "number_too_long": "Number is too long",
+  "enter_number_between": "Please enter a number between\n0.25 and 2.0",
+  "turn_on_notifications": "Turn on Notifications?",
+  "notifications_description": "Receive instant updates on live lectures, upcoming quizzes, and important announcements. Never miss a beat in your academic journey.",
+  "enable_notifications": "Enable notifications",
+  "skip": "Skip",
+  "forgot_password": "Forgot Password?",
+  "username": "username",
+  "password": "password",
+  "enter_your_password": "Enter your password",
+  "home": "Home",
+  "language_selection": "Language",
+    "language_selection_description": "Select your preferred language"
+}
\ No newline at end of file
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
new file mode 100644
index 00000000..f789e0e1
--- /dev/null
+++ b/lib/l10n/app_es.arb
@@ -0,0 +1,99 @@
+{
+  "language": "Español",
+  "@language": {
+    "description": "El idioma actual."
+  },
+  "my_courses": "Mis Cursos",
+  "public_courses": "Cursos Públicos",
+  "live_now": "En Vivo Ahora",
+  "pinned_courses": "Cursos Anclados",
+  "pinned_empty": "No tienes cursos anclados.",
+  "pin": "Anclar",
+  "unpin": "Desanclar",
+  "pinned": "Anclado",
+  "downloads": "Descargas",
+  "download": "Descargar",
+  "notification": "Notificación",
+  "notifications": "Notificaciones",
+  "no_downloaded_courses": "No tienes cursos descargados.",
+  "no_notifications_found": "No se encontraron notificaciones.",
+  "banner_notification": "Notificación de Banner",
+  "recent_uploads": "Cargas Recientes",
+  "feature_notifications": "Feature Notifications",
+  "confirm_unpin_title": "Confirmar Desanclaje",
+  "confirm_unpin_message": "¿Estás seguro de que quieres desanclar este curso?",
+  "newest_first": "Los Más Nuevos Primero",
+  "oldest_first": "Los Más Antiguos Primero",
+  "chat_is_hidden": "El chat está oculto",
+  "chat_is_disabled_for_this_lecture": "El chat está deshabilitado para esta conferencia",
+  "combined_view": "Vista Combinada",
+  "camera_view": "Vista de Cámara",
+  "presentation_view": "Vista de Presentación",
+  "split_view": "Vista Dividida",
+  "starting_download": "Iniciando descarga...",
+  "delete": "Eliminar",
+  "confirm_delete": "Confirmar Eliminación",
+  "confirm_delete_message": "¿Estás seguro de que quieres eliminar esta descarga?",
+  "logout_title": "Cerrar Sesión",
+  "logout_message": "¿Quieres eliminar todas tus descargas y cerrar sesión?",
+  "yes": "Sí",
+  "no": "No",
+  "tum_login": "Inicio de Sesión TUM",
+  "continue_without": "Continuar sin",
+  "use_an_internal_account": "Usar una cuenta interna",
+  "welcome_to_gocast": "Bienvenido a GoCast",
+  "your_lectures_on_the_go": "Tus Conferencias en Movimiento",
+  "type_a_message": "Escribe un mensaje...",
+  "search": "Buscar",
+  "cancel": "Cancelar",
+  "account_settings": "Configuración de la Cuenta",
+  "settings": "Configuraciones",
+  "preferred_greeting": "Saludo Preferido",
+  "push_notifications": "Notificaciones Push",
+  "choose_theme": "Elegir Tema",
+  "dark": "Oscuro",
+  "light": "Claro",
+  "system_default": "Predeterminado del Sistema",
+  "download_over_wifi_only": "Descargar solo por WiFi",
+  "video_playback_speed": "Velocidad de Reproducción de Video",
+  "playback_speed": "Velocidad de Reproducción",
+  "add_custom_playback_speed": "Agregar Velocidad de Reproducción Personalizada",
+  "custom_playback_speed": "Velocidad de Reproducción Personalizada",
+  "logout": "Cerrar Sesión",
+  "more": "Más",
+  "about_us": "Acerca de Nosotros",
+  "privacy_policy": "Política de Privacidad",
+  "terms_and_conditions": "Términos y Condiciones",
+  "no_courses_found": "No se encontraron cursos.",
+  "download_confirmation_title": "Confirmación de Descarga",
+  "download_confirmation_message": "Estás en datos móviles. ¿Quieres descargar el video usando datos móviles?",
+  "download_not_allowed": "Descarga no permitida",
+  "download_not_allowed_message": "Actualmente estás en datos móviles. El video no se puede descargar usando datos móviles debido a tus configuraciones.",
+  "auth_required_title": "Autenticación Requerida",
+  "auth_required_message": "Por favor, inicia sesión para acceder a esta función.",
+  "add_custom_speed": "Agregar Velocidad Personalizada",
+  "enter_speed": "Ingresa la velocidad (por ejemplo, 1.7)",
+  "add": "Agregar",
+  "edit_profile": "Editar Perfil",
+  "preferred_name_saved": "Nombre preferido guardado: {name}",
+  "name_change_limitation": "El nombre preferido solo se puede cambiar cada 3 meses",
+  "error_occurred": "Ocurrió un error",
+  "change_limitation_detail": "Puedes cambiar esto una vez cada tres meses.",
+  "enter_preferred_name": "Ingresa tu nombre preferido",
+  "enter_preferred_name_prompt": "Por favor, ingresa un nombre preferido",
+  "preferred_name": "Nombre Preferido",
+  "save": "Guardar",
+  "number_too_long": "El número es demasiado largo",
+  "enter_number_between": "Por favor, introduce un número entre\n0.25 y 2.0",
+  "turn_on_notifications": "¿Activar notificaciones?",
+  "notifications_description": "Recibe actualizaciones instantáneas sobre conferencias en vivo, próximos cuestionarios y anuncios importantes. Nunca te pierdas un detalle en tu trayectoria académica.",
+  "enable_notifications": "Activar notificaciones",
+  "skip": "Omitir",
+  "forgot_password": "¿Olvidaste la contraseña?",
+  "username": "nombre de usuario",
+  "password": "contraseña",
+  "enter_your_password": "Introduce tu contraseña",
+  "home": "Inicio",
+  "language_selection": "Idioma",
+  "language_selection_description": "Selecciona tu idioma preferido."
+}
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
new file mode 100644
index 00000000..04907259
--- /dev/null
+++ b/lib/l10n/app_fr.arb
@@ -0,0 +1,99 @@
+{
+  "language": "Français",
+  "@language": {
+    "description": "La langue actuelle."
+  },
+  "my_courses": "Mes Cours",
+  "public_courses": "Cours Publics",
+  "live_now": "En Direct",
+  "pinned_courses": "Cours Épinglés",
+  "pinned_empty": "Vous n'avez aucun cours épinglé.",
+  "pin": "Épingler",
+  "unpin": "Détacher",
+  "pinned": "Épinglé",
+  "downloads": "Téléchargements",
+  "download": "Télécharger",
+  "notification": "Notification",
+  "notifications": "Notifications",
+  "no_downloaded_courses": "Vous n'avez aucun cours téléchargé.",
+  "no_notifications_found": "Aucune notification trouvée.",
+  "banner_notification": "Alertes Bannière",
+  "recent_uploads": "Derniers Téléchargements",
+  "feature_notifications": "Notifications de Fonctionnalités",
+  "confirm_unpin_title": "Confirmer le Détachement",
+  "confirm_unpin_message": "Êtes-vous sûr de vouloir détacher ce cours?",
+  "newest_first": "Le Plus Récent en Premier",
+  "oldest_first": "Le Plus Ancien en Premier",
+  "chat_is_hidden": "Le chat est caché",
+  "chat_is_disabled_for_this_lecture": "Le chat est désactivé pour cette conférence",
+  "combined_view": "Vue Combinée",
+  "camera_view": "Vue Caméra",
+  "presentation_view": "Vue de Présentation",
+  "split_view": "Vue Partagée",
+  "starting_download": "Début du téléchargement...",
+  "delete": "Supprimer",
+  "confirm_delete": "Confirmer la Suppression",
+  "confirm_delete_message": "Êtes-vous sûr de vouloir supprimer ce téléchargement?",
+  "logout_title": "Se Déconnecter",
+  "logout_message": "Souhaitez-vous supprimer tous vos téléchargements et vous déconnecter?",
+  "yes": "Oui",
+  "no": "Non",
+  "tum_login": "Connexion TUM",
+  "continue_without": "Continuer sans",
+  "use_an_internal_account": "Utiliser un compte interne",
+  "welcome_to_gocast": "Bienvenue sur GoCast",
+  "your_lectures_on_the_go": "Vos conférences en déplacement",
+  "type_a_message": "Tapez un message...",
+  "search": "Rechercher",
+  "cancel": "Annuler",
+  "account_settings": "Paramètres du Compte",
+  "settings": "Paramètres",
+  "preferred_greeting": "Salutation Préférée",
+  "push_notifications": "Notifications Push",
+  "choose_theme": "Choisir le Thème",
+  "dark": "Sombre",
+  "light": "Clair",
+  "system_default": "Défaut du Système",
+  "download_over_wifi_only": "Télécharger uniquement via WiFi",
+  "video_playback_speed": "Vitesse de Lecture Vidéo",
+  "playback_speed": "Vitesse de Lecture",
+  "add_custom_playback_speed": "Ajouter une Vitesse de Lecture Personnalisée",
+  "custom_playback_speed": "Vitesse de Lecture Personnalisée",
+  "logout": "Se Déconnecter",
+  "more": "Plus",
+  "about_us": "À Propos de Nous",
+  "privacy_policy": "Politique de Confidentialité",
+  "terms_and_conditions": "Conditions Générales",
+  "no_courses_found": "Aucun cours trouvé.",
+  "download_confirmation_title": "Confirmation de Téléchargement",
+  "download_confirmation_message": "Vous utilisez des données mobiles. Voulez-vous télécharger la vidéo en utilisant les données mobiles ?",
+  "download_not_allowed": "Téléchargement non autorisé",
+  "download_not_allowed_message": "Vous utilisez actuellement des données mobiles. La vidéo ne peut pas être téléchargée en utilisant les données mobiles en raison de vos paramètres.",
+  "auth_required_title": "Authentification requise",
+  "auth_required_message": "Veuillez vous connecter pour accéder à cette fonctionnalité.",
+  "add_custom_speed": "Ajouter une Vitesse Personnalisée",
+  "enter_speed": "Entrez la vitesse (par exemple, 1.7)",
+  "add": "Ajouter",
+  "edit_profile": "Modifier le Profil",
+  "preferred_name_saved": "Nom préféré enregistré : {name}",
+  "name_change_limitation": "Le nom préféré ne peut être changé que tous les 3 mois",
+  "error_occurred": "Une erreur s'est produite",
+  "change_limitation_detail": "Vous pouvez changer cela une fois tous les trois mois.",
+  "enter_preferred_name": "Entrez votre nom préféré",
+  "enter_preferred_name_prompt": "Veuillez entrer un nom préféré",
+  "preferred_name": "Nom Préféré",
+  "save": "Enregistrer",
+  "number_too_long": "Le numéro est trop long",
+  "enter_number_between": "Veuillez entrer un nombre entre\n0.25 et 2.0",
+  "turn_on_notifications": "Activer les notifications ?",
+  "notifications_description": "Recevez des mises à jour instantanées sur les conférences en direct, les quiz à venir et les annonces importantes. Ne manquez jamais un moment clé de votre parcours académique.",
+  "enable_notifications": "Activer les notifications",
+  "skip": "Passer",
+  "forgot_password": "Mot de passe oublié ?",
+  "username": "nom d'utilisateur",
+  "password": "mot de passe",
+  "enter_your_password": "Entrez votre mot de passe",
+  "home": "Accueil",
+  "language_selection": "Langue",
+  "language_selection_description": "Choisissez votre langue préférée."
+}
diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
new file mode 100644
index 00000000..8cd076cc
--- /dev/null
+++ b/lib/l10n/l10n.dart
@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class L10n {
+  static final all = [
+    const Locale('en'),
+    const Locale('de'),
+    const Locale('fr'),
+    const Locale('es'),
+  ];
+}
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 68f48d7f..45041552 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,71 +1,109 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
-import 'package:gocast_mobile/config/app_config.dart';
-import 'package:gocast_mobile/models/error/error_model.dart';
 import 'package:gocast_mobile/models/user/user_state_model.dart';
-import 'package:gocast_mobile/view_models/UserViewModel.dart';
-import 'package:gocast_mobile/views/course_view/courses_overview_view.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/UserPreferences.dart';
+import 'package:gocast_mobile/utils/globals.dart';
+import 'package:gocast_mobile/utils/theme.dart';
+import 'package:gocast_mobile/navigation_tab.dart';
+import 'package:gocast_mobile/views/course_view/list_courses_view/public_courses_view.dart';
 import 'package:gocast_mobile/views/login_view/internal_login_view.dart';
 import 'package:gocast_mobile/views/on_boarding_view/welcome_screen_view.dart';
-import 'package:gocast_mobile/views/utils/globals.dart';
-import 'package:gocast_mobile/views/utils/theme.dart';
 import 'package:logger/logger.dart';
+import 'package:firebase_core/firebase_core.dart';
+import 'firebase_options.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:gocast_mobile/l10n/l10n.dart';
 
-import 'base/networking/api/gocast/api_v2.pb.dart';
+final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
 
-final grpcHandlerProvider =
-    Provider((ref) => GrpcHandler(Routes.grpcHost, Routes.grpcPort));
-final userViewModel =
-    Provider((ref) => UserViewModel(ref.watch(grpcHandlerProvider)));
+Future<void> main() async {
+  Logger.level = Level.info;
+  WidgetsFlutterBinding.ensureInitialized();
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  await UserPreferences.init();
 
-void main() {
-  Logger.level = Level.debug;
-  runApp(const ProviderScope(child: App()));
+  runApp(
+     const ProviderScope(
+      child: App(),
+    ),
+  );
 }
 
-final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+bool isPushNotificationListenerSet = false;
 
 class App extends ConsumerWidget {
-  const App({super.key});
+
+   const App({
+    super.key,
+  });
+
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return StreamBuilder<UserState>(
-      stream: ref.watch(userViewModel).current.stream,
-      builder: (context, snapshot) {
-        if (snapshot.hasError) {
-          final error = snapshot.error as AppError;
-          WidgetsBinding.instance.addPostFrameCallback(
-            (_) => scaffoldMessengerKey.currentState!.showSnackBar(
-              SnackBar(content: Text('Error: ${error.message}')),
-            ),
-          );
-        }
-
-        final Widget homeScreen = _getHomeScreen(snapshot.data?.user);
-
-        return MaterialApp(
-          theme: appTheme,
-          navigatorKey: navigatorKey,
-          scaffoldMessengerKey: scaffoldMessengerKey,
-          home: homeScreen,
-          routes: _buildRoutes(homeScreen),
-        );
-      },
+    final userState = ref.watch(userViewModelProvider);
+
+    bool isLoggedIn = ref.watch(userViewModelProvider).user != null;
+
+
+    _handleErrors(ref, userState);
+    _setupNotifications(ref, userState);
+
+    return MaterialApp(
+      localizationsDelegates: const [
+        AppLocalizations.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
+      supportedLocales: L10n.all,
+      locale: Locale(UserPreferences.getLanguage()),
+      theme: appTheme, // Your light theme
+      darkTheme: darkAppTheme, // Define your dark theme
+      themeMode:
+          ref.watch(themeModeProvider), // Use the theme mode from the provider
+      navigatorKey: navigatorKey,
+      scaffoldMessengerKey: scaffoldMessengerKey,
+      home: !isLoggedIn
+          ? const WelcomeScreen()
+          : const NavigationTab(),
+      routes: _buildRoutes(),
     );
   }
 
-  Widget _getHomeScreen(User? user) {
-    return user == null ? const WelcomeScreen() : const CourseOverview();
+  void _handleErrors(WidgetRef ref, UserState userState) {
+    // Check for errors in userState and show a SnackBar if there are any
+    if (userState.error != null) {
+      Future.microtask(() {
+        scaffoldMessengerKey.currentState?.showSnackBar(
+          SnackBar(content: Text('Error: ${userState.error!.message}')),
+        );
+        // Clear the error
+        ref.read(userViewModelProvider).clearError();
+      });
+    }
   }
 
-  Map<String, WidgetBuilder> _buildRoutes(Widget homeScreen) {
+  Map<String, WidgetBuilder> _buildRoutes() {
     return {
-      '/welcome': (context) => homeScreen,
-      '/home': (context) => homeScreen,
+      '/welcome': (context) => const WelcomeScreen(),
       '/login': (context) => const InternalLoginScreen(),
-      '/courses': (context) => const CourseOverview(),
+      '/navigationTab': (context) => const NavigationTab(),
+      '/publiccourses': (context) => const PublicCourses(),
     };
   }
+
+  _setupNotifications(WidgetRef ref, UserState userState) {
+    final nvmn = ref.read(notificationViewModelProvider.notifier);
+
+    // Push notifications (e.g. "stream xyz just started") are shown only once
+    nvmn.initPushNotifications();
+
+    if (userState.user != null) {
+      // Upload notifications (e.g., "New VoD for course xyz" are available for
+      // logged in users only and can be also seen in the "notificaions" tab
+      nvmn.handleUploadNotifications(ref);
+    }
+  }
 }
diff --git a/lib/models/chat/chat_state_model.dart b/lib/models/chat/chat_state_model.dart
new file mode 100644
index 00000000..399f1999
--- /dev/null
+++ b/lib/models/chat/chat_state_model.dart
@@ -0,0 +1,108 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+
+@immutable
+class ChatState {
+  final bool isLoading;
+  final List<ChatMessage>? messages;
+  final AppError? error;
+  final List<ChatReaction>? reactions;
+  final List<ChatMessage>? replies;
+  final bool isRateLimitReached;
+  final bool isCoolDown;
+  final bool accessDenied;
+  final bool isResolved;
+
+  const ChatState({
+    this.isLoading = false,
+    this.messages,
+    this.error,
+    this.reactions,
+    this.replies,
+    this.isRateLimitReached = false,
+    this.isCoolDown = false,
+    this.accessDenied = false,
+    this.isResolved = false,
+  });
+
+  ChatState copyWith({
+    bool? isLoading,
+    List<ChatMessage>? messages,
+    AppError? error,
+    List<ChatReaction>? reactions,
+    List<ChatMessage>? replies,
+    bool? isRateLimitReached,
+    bool? isCoolDown,
+    bool? accessDenied,
+    bool? isResolved,
+  }) {
+    return ChatState(
+      isLoading: isLoading ?? this.isLoading,
+      messages: messages ?? this.messages,
+      error: error ?? this.error,
+      reactions: reactions ?? this.reactions,
+      replies: replies ?? this.replies,
+      isRateLimitReached: isRateLimitReached ?? this.isRateLimitReached,
+      isCoolDown: isCoolDown ?? this.isCoolDown,
+      accessDenied: accessDenied ?? this.accessDenied,
+      isResolved: isResolved ?? this.isResolved,
+    );
+  }
+
+  ChatState clearError() {
+    return ChatState(
+      isLoading: isLoading,
+      messages: messages,
+      reactions: reactions,
+      replies: replies,
+      isRateLimitReached: isRateLimitReached,
+      isCoolDown: isCoolDown,
+      accessDenied: accessDenied,
+      error: null,
+      isResolved: isResolved,
+    );
+  }
+
+  ChatState addMessage(ChatMessage message) {
+    return ChatState(
+      isLoading: isLoading,
+      messages: messages != null ? [...messages!, message] : [message],
+      reactions: reactions,
+      replies: replies,
+      isRateLimitReached: isRateLimitReached,
+      isCoolDown: isCoolDown,
+      accessDenied: accessDenied,
+      isResolved: isResolved,
+      error: error,
+    );
+  }
+
+  ChatState addReaction(ChatReaction reaction) {
+    return ChatState(
+      isLoading: isLoading,
+      messages: messages,
+      reactions: reactions != null ? [...reactions!, reaction] : [reaction],
+      replies: replies,
+      isRateLimitReached: isRateLimitReached,
+      isCoolDown: isCoolDown,
+      accessDenied: accessDenied,
+      isResolved: isResolved,
+      error: error,
+    );
+  }
+
+  ChatState addReply(ChatMessage reply) {
+    return ChatState(
+      isLoading: isLoading,
+      messages: messages,
+      reactions: reactions,
+      replies: replies != null ? [...replies!, reply] : [reply],
+      isRateLimitReached: isRateLimitReached,
+      isCoolDown: isCoolDown,
+      accessDenied: accessDenied,
+      isResolved: isResolved,
+      error: error,
+    );
+  }
+}
diff --git a/lib/models/course/course_model.dart b/lib/models/course/course_model.dart
deleted file mode 100644
index 7720e923..00000000
--- a/lib/models/course/course_model.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-/// Course model
-///
-/// A model class to represent a course.
-/// This Model is a temporary model to display the course list.
-/// This model will be replaced by the actual model class once the API for retrieving
-/// the course list is ready.
-class CourseModel {
-  final String title;
-  final String subtitle;
-  final String imagePath;
-
-  CourseModel({
-    required this.title,
-    required this.subtitle,
-    required this.imagePath,
-  });
-}
diff --git a/lib/models/course/course_state_model.dart b/lib/models/course/course_state_model.dart
new file mode 100644
index 00000000..d7813ba6
--- /dev/null
+++ b/lib/models/course/course_state_model.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+
+@immutable
+class CourseState {
+  final bool isLoading;
+  final List<Course>? allCourses;
+  final AppError? error;
+  final Course? course;
+
+  const CourseState({
+    this.isLoading = false,
+    this.allCourses,
+    this.error,
+    this.course,
+  });
+
+  CourseState copyWith({
+    bool? isLoading,
+    List<Course>? allCourses,
+    Course? course,
+    List<Stream>? allCourseStreams,
+    AppError? error,
+  }) {
+    return CourseState(
+      isLoading: isLoading ?? this.isLoading,
+      allCourses: allCourses ?? this.allCourses,
+      course: course ?? this.course,
+      error: error ?? this.error,
+    );
+  }
+
+  CourseState clearError() {
+    return CourseState(
+      isLoading: isLoading,
+      allCourses: allCourses,
+      course: course,
+      error: null,
+    );
+  }
+
+  CourseState addCourse(Course course) {
+    return CourseState(
+      isLoading: isLoading,
+      allCourses: allCourses != null ? [...allCourses!, course] : [course],
+      error: null,
+    );
+  }
+}
diff --git a/lib/models/course/pinned_course_state_model.dart b/lib/models/course/pinned_course_state_model.dart
new file mode 100644
index 00000000..63150dee
--- /dev/null
+++ b/lib/models/course/pinned_course_state_model.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+
+@immutable
+class PinnedCourseState {
+  final bool? isLoading;
+  final List<Course>? userPinned;
+  final AppError? error;
+  final List<Course>? displayedPinnedCourses;
+  final List<Semester>? semesters;
+  final String? selectedSemester;
+  final List<String>? semestersAsString;
+  final Semester? current;
+  final String? currentAsString;
+
+  const PinnedCourseState({
+    this.isLoading = false,
+    this.userPinned,
+    this.error,
+    this.displayedPinnedCourses,
+    this.semesters,
+    this.selectedSemester = 'All',
+    this.semestersAsString,
+    this.current,
+    this.currentAsString,
+  });
+
+  PinnedCourseState copyWith({
+    bool? isLoading,
+    List<Course>? userPinned,
+    AppError? error,
+    List<Course>? displayedPinnedCourses,
+    List<Semester>? semesters,
+    String? selectedSemester,
+    List<String>? semestersAsString,
+    Semester? current,
+    String? currentAsString,
+  }) {
+    return PinnedCourseState(
+      isLoading: isLoading ?? this.isLoading,
+      userPinned: userPinned ?? this.userPinned,
+      error: error ?? this.error,
+      displayedPinnedCourses: displayedPinnedCourses ?? this.displayedPinnedCourses,
+      semesters: semesters ?? this.semesters,
+      selectedSemester: selectedSemester ?? this.selectedSemester,
+      semestersAsString: semestersAsString ?? this.semestersAsString,
+      current: current ?? this.current,
+      currentAsString: currentAsString ?? this.currentAsString,
+    );
+  }
+
+  PinnedCourseState clearError() {
+    return PinnedCourseState(
+      isLoading: isLoading,
+      userPinned: userPinned,
+      error: null,
+      displayedPinnedCourses: displayedPinnedCourses,
+      semesters: semesters,
+      selectedSemester: selectedSemester,
+      semestersAsString: semestersAsString,
+      current: current,
+      currentAsString: currentAsString,
+    );
+  }
+
+}
\ No newline at end of file
diff --git a/lib/models/download/download_state_model.dart b/lib/models/download/download_state_model.dart
new file mode 100644
index 00000000..f01322f8
--- /dev/null
+++ b/lib/models/download/download_state_model.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+
+@immutable
+class DownloadState {
+  final Map<int, VideoDetails> downloadedVideos;
+
+  const DownloadState({
+    this.downloadedVideos = const {},
+  });
+
+  DownloadState copyWith({
+    Map<int, VideoDetails>? downloadedVideos,
+  }) {
+    return DownloadState(
+      downloadedVideos: downloadedVideos ?? this.downloadedVideos,
+    );
+  }
+}
+
+@immutable
+class VideoDetails {
+  final String filePath;
+  final String name;
+  final int duration; // Duration in seconds or your preferred unit
+  final String description;
+
+  const VideoDetails({
+    required this.filePath,
+    required this.name,
+    required this.duration,
+    required this.description,
+  });
+
+  VideoDetails copyWith({
+    String? filePath,
+    String? name,
+    int? duration,
+  }) {
+    return VideoDetails(
+      filePath: filePath ?? this.filePath,
+      name: name ?? this.name,
+      duration: duration ?? this.duration,
+      description: description,
+    );
+  }
+}
diff --git a/lib/models/error/error_model.dart b/lib/models/error/error_model.dart
index b4fa9028..de8ccfcf 100644
--- a/lib/models/error/error_model.dart
+++ b/lib/models/error/error_model.dart
@@ -31,6 +31,10 @@ class AppError implements Exception {
   factory AppError.tokenSaveError([dynamic error]) =>
       AppError('🔑 Token error occurred', error);
 
+  /// Represents an already_exists error when a resource already exists
+  factory AppError.conflictError([dynamic error]) =>
+      AppError('Resource already exists');
+
   /// Represents a JSON parsing error.
   factory AppError.jsonParsingError([dynamic error]) =>
       AppError('🔍 Unable to parse the data', error);
@@ -67,5 +71,9 @@ class AppError implements Exception {
 
   /// Represents an unknown error.
   factory AppError.unknownError(String? message) =>
-      AppError('❓ An unknown error occurred {message: $message}');
+      AppError('❓An unknown error occurred {message: $message}');
+
+  factory AppError.userError() => AppError('🥱Username or password are incorrect');
+
+  factory AppError.notificationNotAvailableYet() => AppError('🔕Notification not available yet, Set the FireBase keys first');
 }
diff --git a/lib/models/notifications/notification_state_model.dart b/lib/models/notifications/notification_state_model.dart
new file mode 100644
index 00000000..7acc41f7
--- /dev/null
+++ b/lib/models/notifications/notification_state_model.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/models/notifications/push_notification.dart';
+
+@immutable
+class NotificationState {
+  final bool isLoading;
+  final List<PushNotification>? pushNotifications;
+  final List<FeatureNotification>? featureNotifications;
+  final List<BannerAlert>? bannerAlerts;
+  final AppError? error;
+
+  const NotificationState({
+    this.isLoading = false,
+    this.pushNotifications,
+    this.featureNotifications,
+    this.bannerAlerts,
+    this.error,
+  });
+
+  NotificationState copyWith({
+    bool? isLoading,
+    List<PushNotification>? pushNotifications,
+    List<FeatureNotification>? featureNotifications,
+    List<BannerAlert>? bannerAlerts,
+    AppError? error,
+  }) {
+    return NotificationState(
+      isLoading: isLoading ?? this.isLoading,
+      pushNotifications: pushNotifications ?? this.pushNotifications,
+      featureNotifications: featureNotifications ?? this.featureNotifications,
+      bannerAlerts: bannerAlerts ?? this.bannerAlerts,
+      error: error ?? this.error,
+    );
+  }
+
+  NotificationState clearError({
+    bool? isLoading,
+    List<PushNotification>? pushNotifications,
+    List<FeatureNotification>? featureNotifications,
+    List<BannerAlert>? bannerAlerts,
+    AppError? error,
+  }) {
+    return NotificationState(
+      isLoading: isLoading ?? this.isLoading,
+      pushNotifications: pushNotifications ?? this.pushNotifications,
+      featureNotifications: featureNotifications ?? this.featureNotifications,
+      bannerAlerts: bannerAlerts ?? this.bannerAlerts,
+      error: null,
+    );
+  }
+}
diff --git a/lib/models/notifications/push_notification.dart b/lib/models/notifications/push_notification.dart
new file mode 100644
index 00000000..a9a0dac2
--- /dev/null
+++ b/lib/models/notifications/push_notification.dart
@@ -0,0 +1,31 @@
+class PushNotification {
+  final String title;
+  final String body;
+  final Map<String, dynamic> data;
+  final DateTime receivedAt;
+
+  PushNotification({
+    required this.title,
+    required this.body,
+    required this.data,
+    required this.receivedAt,
+  });
+
+  factory PushNotification.fromJson(Map<String, dynamic> json) {
+    return PushNotification(
+      title: json['title'],
+      body: json['body'],
+      data: json['data'],
+      receivedAt: DateTime.now(),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'title': title,
+      'body': body,
+      'data': data,
+      'received_at': receivedAt,
+    };
+  }
+}
diff --git a/lib/models/poll/poll_state_model.dart b/lib/models/poll/poll_state_model.dart
new file mode 100644
index 00000000..c9a29a3c
--- /dev/null
+++ b/lib/models/poll/poll_state_model.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart'; // Assuming Poll is defined here
+import 'package:gocast_mobile/models/error/error_model.dart';
+
+@immutable
+class PollState {
+  final bool isLoading;
+  final List<Poll>? polls;
+  final Map<int, int> answeredPolls; // pollId, pollOptionId
+  final AppError? error;
+
+  const PollState({
+    this.isLoading = false,
+    this.polls,
+    this.error,
+    this.answeredPolls = const {},
+  });
+
+  PollState copyWith({
+    bool? isLoading,
+    List<Poll>? polls,
+    Map<int, int>? answeredPolls,
+    AppError? error,
+    bool? isRateLimitReached,
+    bool? accessDenied,
+  }) {
+    return PollState(
+      isLoading: isLoading ?? this.isLoading,
+      polls: polls ?? this.polls,
+      answeredPolls: answeredPolls ?? this.answeredPolls,
+      error: error ?? this.error,
+    );
+  }
+
+  PollState clearError() {
+    return PollState(
+      isLoading: isLoading,
+      polls: polls,
+      answeredPolls: answeredPolls,
+      error: null,
+    );
+  }
+
+  PollState addAnsweredPoll(int pollId, int pollOptionId) {
+    // Create a new map from the existing answeredPolls and add the new answered poll
+    final updatedAnsweredPolls = Map<int, int>.from(answeredPolls)
+      ..[pollId] = pollOptionId;
+
+    // Return a new PollState with the updated map
+    return PollState(
+      isLoading: isLoading,
+      polls: polls,
+      answeredPolls: updatedAnsweredPolls,
+      error: error,
+    );
+  }
+}
diff --git a/lib/models/settings/setting_state_model.dart b/lib/models/settings/setting_state_model.dart
new file mode 100644
index 00000000..4e876a91
--- /dev/null
+++ b/lib/models/settings/setting_state_model.dart
@@ -0,0 +1,70 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+
+@immutable
+class SettingState {
+  final bool isLoading;
+  final List<UserSetting>? userSettings;
+  final AppError? error;
+  final bool isDarkMode;
+  final bool isLightMode;
+  final bool isSystemDefault;
+  final bool isPushNotificationsEnabled;
+  final bool isDownloadWithWifiOnly;
+
+  const SettingState({
+    this.isLoading = false,
+    this.userSettings,
+    this.error,
+    this.isDarkMode = false,
+    this.isLightMode = false,
+    this.isSystemDefault = true,
+    this.isPushNotificationsEnabled = true,
+    this.isDownloadWithWifiOnly = false,
+  });
+
+  SettingState copyWith({
+    bool? isLoading,
+    List<UserSetting>? userSettings,
+    AppError? error,
+    bool? isDarkMode,
+    bool? isLightMode,
+    bool? isSystemDefault,
+    bool? isPushNotificationsEnabled,
+    bool? isDownloadWithWifiOnly,
+  }) {
+    return SettingState(
+      isLoading: isLoading ?? this.isLoading,
+      userSettings: userSettings ?? this.userSettings,
+      error: error ?? this.error,
+      isDarkMode: isDarkMode ?? this.isDarkMode,
+      isLightMode: isLightMode ?? this.isLightMode,
+      isSystemDefault: isSystemDefault ?? this.isSystemDefault,
+      isPushNotificationsEnabled:
+          isPushNotificationsEnabled ?? this.isPushNotificationsEnabled,
+      isDownloadWithWifiOnly:
+          isDownloadWithWifiOnly ?? this.isDownloadWithWifiOnly,
+    );
+  }
+
+  SettingState clearError({
+    bool? isLoading,
+    List<UserSetting>? userSettings,
+    AppError? error,
+    bool? isDarkMode,
+    bool? isPushNotificationsEnabled,
+    bool? isDownloadWithWifiOnly,
+  }) {
+    return SettingState(
+      isLoading: isLoading ?? this.isLoading,
+      userSettings: userSettings ?? this.userSettings,
+      error: null,
+      isDarkMode: isDarkMode ?? this.isDarkMode,
+      isPushNotificationsEnabled:
+          isPushNotificationsEnabled ?? this.isPushNotificationsEnabled,
+      isDownloadWithWifiOnly:
+          isDownloadWithWifiOnly ?? this.isDownloadWithWifiOnly,
+    );
+  }
+}
diff --git a/lib/models/user/user_state_model.dart b/lib/models/user/user_state_model.dart
index d12db1b4..d3fc525e 100644
--- a/lib/models/user/user_state_model.dart
+++ b/lib/models/user/user_state_model.dart
@@ -1,34 +1,114 @@
 import 'package:flutter/material.dart';
 import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
 
+@immutable
 class UserState {
-  bool isLoading;
-  User? user;
+  final bool isLoading;
+  final User? user;
+  final List<Course>? userCourses;
+  final List<Bookmark>? userBookmarks;
+  final List<Course>? publicCourses;
+  final AppError? error;
+  final List<Course>? downloadedCourses;
+  final List<Semester>? semesters;
+  final String? selectedSemester;
+  final List<String>? semestersAsString;
+  final Semester? current;
+  final String? currentAsString;
+  final List<Course>? displayedCourses;
 
-  UserState({
-    required this.isLoading,
+  const UserState({
+    this.isLoading = false,
     this.user,
+    this.userCourses,
+    this.userBookmarks,
+    this.publicCourses,
+    this.error,
+    this.downloadedCourses,
+    this.semesters,
+    this.selectedSemester = 'All',
+    this.semestersAsString,
+    this.current,
+    this.currentAsString,
+    this.displayedCourses,
   });
 
-  // Default constructor
-  UserState.defaultConstructor()
-      : isLoading = false,
-        user = null;
-
-  void setUser(User newUser) {
-    debugPrint("User set to: ${newUser.name}");
-    user = newUser;
-  }
-
-  void removeUser() {
-    user = null;
+  UserState copyWith({
+    bool? isLoading,
+    User? user,
+    List<Course>? userCourses,
+    List<Bookmark>? userBookmarks,
+    List<Course>? publicCourses,
+    AppError? error,
+    List<Course>? downloadedCourses,
+    List<Semester>? semesters,
+    String? selectedSemester,
+    List<String>? semestersAsString,
+    Semester? current,
+    String? currentAsString,
+    List<Course>? displayedCourses,
+  }) {
+    return UserState(
+      isLoading: isLoading ?? this.isLoading,
+      user: user ?? this.user,
+      userCourses: userCourses ?? this.userCourses,
+      userBookmarks: userBookmarks ?? this.userBookmarks,
+      publicCourses: publicCourses ?? this.publicCourses,
+      error: error ?? this.error,
+      downloadedCourses: downloadedCourses ?? this.downloadedCourses,
+      semesters: semesters ?? this.semesters,
+      selectedSemester: selectedSemester ?? this.selectedSemester,
+      semestersAsString: semestersAsString ?? this.semestersAsString,
+      current: current ?? this.current,
+      currentAsString: currentAsString ?? this.currentAsString,
+      displayedCourses: displayedCourses ?? this.displayedCourses,
+    );
   }
 
-  void setIsLoading(bool isLoading) {
-    this.isLoading = isLoading;
+  UserState clearError({
+    bool? isLoading,
+    User? user,
+    List<Course>? userCourses,
+    List<Bookmark>? userBookmarks,
+    List<Course>? publicCourses,
+    AppError? error,
+    List<Course>? downloadedCourses,
+    List<Course>? displayedCourses,
+    List<Semester>? semesters,
+  }) {
+    return UserState(
+      isLoading: isLoading ?? this.isLoading,
+      user: user ?? this.user,
+      userCourses: userCourses ?? this.userCourses,
+      userBookmarks: userBookmarks ?? this.userBookmarks,
+      publicCourses: publicCourses ?? this.publicCourses,
+      error: null,
+      downloadedCourses: downloadedCourses ?? this.downloadedCourses,
+      semesters: semesters ?? this.semesters,
+      selectedSemester: selectedSemester,
+      semestersAsString: semestersAsString,
+      current: current,
+      currentAsString: currentAsString,
+      displayedCourses: displayedCourses ?? this.displayedCourses,
+    );
   }
 
-  void toggleIsLoading() {
-    isLoading = !isLoading;
+  UserState reset() {
+    return const UserState(
+      isLoading: false,
+      user: null,
+      userCourses: null,
+      userBookmarks: null,
+      publicCourses: null,
+      error: null,
+      downloadedCourses: null,
+      semesters: null,
+      selectedSemester: 'All',
+      semestersAsString: null,
+      current: null,
+      currentAsString: null,
+      displayedCourses: null,
+    );
   }
 }
diff --git a/lib/models/video/stream_state_model.dart b/lib/models/video/stream_state_model.dart
new file mode 100644
index 00000000..b4626af0
--- /dev/null
+++ b/lib/models/video/stream_state_model.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:tuple/tuple.dart';
+
+@immutable
+class StreamState {
+  final bool isLoading;
+  final List<Stream>? streams;
+  final List<Stream>? liveStreams;
+  final AppError? error;
+  final Progress? progress;
+  final bool isWatched;
+  final String? videoSource;
+  final List<Tuple2<Stream, String>>? streamsWithThumb;
+  final List<Tuple2<Stream, String>>? liveStreamsWithThumb;
+  final List<Tuple2<Stream, String>>? displayedStreams;
+  final String selectedFilterOption;
+
+  const StreamState({
+    this.isLoading = false,
+    this.streams,
+    this.liveStreams,
+    this.error,
+    this.progress,
+    this.isWatched = false,
+    this.videoSource,
+    this.streamsWithThumb,
+    this.liveStreamsWithThumb,
+    this.displayedStreams,
+    this.selectedFilterOption = 'Oldest First',
+  });
+
+  StreamState copyWith({
+    bool? isLoading,
+    List<Stream>? streams,
+    List<Stream>? liveStreams,
+    List<String>? thumbnails,
+    AppError? error,
+    Progress? progress,
+    bool? isWatched,
+    String? videoSource,
+    Map<int, String>? downloadedVideos,
+    List<Tuple2<Stream, String>>? streamsWithThumb,
+    List<Tuple2<Stream, String>>? liveStreamsWithThumb,
+    List<Tuple2<Stream, String>>? displayedStreams,
+    String? selectedFilterOption,
+  }) {
+    return StreamState(
+      isLoading: isLoading ?? this.isLoading,
+      streams: streams ?? this.streams,
+      liveStreams: liveStreams ?? this.liveStreams,
+      error: error ?? this.error,
+      progress: progress ?? this.progress,
+      isWatched: isWatched ?? this.isWatched,
+      videoSource: videoSource ?? this.videoSource,
+      streamsWithThumb: streamsWithThumb ?? this.streamsWithThumb,
+      liveStreamsWithThumb: liveStreamsWithThumb ?? this.liveStreamsWithThumb,
+      displayedStreams: displayedStreams ?? this.displayedStreams,
+      selectedFilterOption: selectedFilterOption ?? this.selectedFilterOption,
+    );
+  }
+
+  StreamState clearError() {
+    return StreamState(
+      isLoading: isLoading,
+      streams: streams,
+      liveStreams: liveStreams,
+      progress: progress,
+      isWatched: isWatched,
+      videoSource: videoSource,
+      streamsWithThumb: streamsWithThumb,
+      liveStreamsWithThumb: liveStreamsWithThumb,
+      displayedStreams: displayedStreams,
+      error: null,
+    );
+  }
+
+  StreamState switchVideoSource(String videoSource) {
+    return StreamState(
+      isLoading: isLoading,
+      streams: streams,
+      liveStreams: liveStreams,
+      progress: progress,
+      isWatched: isWatched,
+      videoSource: videoSource,
+      streamsWithThumb: streamsWithThumb,
+      liveStreamsWithThumb: liveStreamsWithThumb,
+      displayedStreams: displayedStreams,
+      error: null,
+    );
+  }
+}
diff --git a/lib/navigation_tab.dart b/lib/navigation_tab.dart
new file mode 100644
index 00000000..66246071
--- /dev/null
+++ b/lib/navigation_tab.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/views/course_view/downloaded_courses_view/downloaded_courses_view.dart';
+import 'package:gocast_mobile/views/course_view/pinned_courses_view/pinned_courses_view.dart';
+import 'package:gocast_mobile/views/notifications_view/notifications_overview.dart';
+import 'providers.dart';
+import 'views/course_view/courses_overview.dart';
+
+class NavigationTab extends ConsumerWidget {
+  const NavigationTab({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentIndex = ref.watch(currentIndexProvider);
+
+    return Scaffold(
+      body: IndexedStack(
+        index: currentIndex,
+        children: const [
+          CourseOverview(),
+          DownloadedCourses(),
+          PinnedCourses(),
+          MyNotifications(),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/providers.dart b/lib/providers.dart
new file mode 100644
index 00000000..7de218d8
--- /dev/null
+++ b/lib/providers.dart
@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/config/app_config.dart';
+import 'package:gocast_mobile/models/chat/chat_state_model.dart';
+import 'package:gocast_mobile/models/course/course_state_model.dart';
+import 'package:gocast_mobile/models/course/pinned_course_state_model.dart';
+import 'package:gocast_mobile/models/notifications/notification_state_model.dart';
+import 'package:gocast_mobile/models/poll/poll_state_model.dart';
+import 'package:gocast_mobile/models/settings/setting_state_model.dart';
+import 'package:gocast_mobile/models/user/user_state_model.dart';
+import 'package:gocast_mobile/view_models/chat_view_model.dart';
+import 'package:gocast_mobile/view_models/course_view_model.dart';
+import 'package:gocast_mobile/view_models/notification_view_model.dart';
+import 'package:gocast_mobile/view_models/download_view_model.dart';
+import 'package:gocast_mobile/view_models/pinned_view_model.dart';
+import 'package:gocast_mobile/view_models/poll_view_model.dart';
+import 'package:gocast_mobile/view_models/setting_view_model.dart';
+import 'package:gocast_mobile/view_models/stream_view_model.dart';
+import 'package:gocast_mobile/view_models/user_view_model.dart';
+import 'base/networking/api/gocast/api_v2.pb.dart';
+import 'base/networking/api/handler/grpc_handler.dart';
+import 'models/download/download_state_model.dart';
+import 'models/video/stream_state_model.dart';
+
+final grpcHandlerProvider =
+    Provider((ref) => GrpcHandler(Routes.grpcHost, Routes.grpcPort));
+
+final userViewModelProvider = StateNotifierProvider<UserViewModel, UserState>(
+  (ref) => UserViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final videoViewModelProvider =
+    StateNotifierProvider<StreamViewModel, StreamState>(
+  (ref) => StreamViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final notificationViewModelProvider =
+    StateNotifierProvider<NotificationViewModel, NotificationState>(
+  (ref) => NotificationViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final currentIndexProvider = StateProvider<int>((ref) => 0);
+
+final themeModeProvider = StateProvider<ThemeMode>((ref) {
+  return ThemeMode.system; // Default to system theme
+});
+
+final chatViewModelProvider = StateNotifierProvider<ChatViewModel, ChatState>(
+  (ref) => ChatViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final courseViewModelProvider =
+    StateNotifierProvider<CourseViewModel, CourseState>(
+  (ref) => CourseViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final pinnedCourseViewModelProvider =
+    StateNotifierProvider<PinnedViewModel, PinnedCourseState>(
+  (ref) => PinnedViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final downloadViewModelProvider =
+    StateNotifierProvider<DownloadViewModel, DownloadState>((ref) {
+  return DownloadViewModel();
+});
+
+final settingViewModelProvider =
+    StateNotifierProvider<SettingViewModel, SettingState>((ref) {
+  return SettingViewModel(ref.watch(grpcHandlerProvider));
+});
+final pollViewModelProvider = StateNotifierProvider<PollViewModel, PollState>(
+  (ref) => PollViewModel(ref.watch(grpcHandlerProvider)),
+);
+
+final progressProvider = FutureProvider.autoDispose.family<Progress, int>(
+  (ref, streamId) async {
+    final videoViewModel = ref.watch(videoViewModelProvider.notifier);
+    return videoViewModel.fetchProgressForStream(streamId);
+  },
+);
diff --git a/lib/utils/UserPreferences.dart b/lib/utils/UserPreferences.dart
new file mode 100644
index 00000000..d92f5506
--- /dev/null
+++ b/lib/utils/UserPreferences.dart
@@ -0,0 +1,27 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+class UserPreferences {
+  static SharedPreferences? _preferences;
+
+  static const _keyLanguage = 'language';
+
+  static Future init() async => _preferences = await SharedPreferences.getInstance();
+
+  static Future setLanguage(String language) async => await _preferences?.setString(_keyLanguage, language);
+
+  static String getLanguage() => _preferences?.getString(_keyLanguage) ?? 'en';
+
+  static String getLanguageName(String lang) {
+    switch (lang) {
+      case 'en':
+        return 'English';
+      case 'es':
+        return 'Español';
+      case 'fr':
+        return 'Français';
+      case 'de':
+        return 'Deutsch';
+    }
+    return 'English';
+  }
+}
diff --git a/lib/views/utils/constants.dart b/lib/utils/constants.dart
similarity index 100%
rename from lib/views/utils/constants.dart
rename to lib/utils/constants.dart
diff --git a/lib/views/utils/globals.dart b/lib/utils/globals.dart
similarity index 99%
rename from lib/views/utils/globals.dart
rename to lib/utils/globals.dart
index 10d3e900..d2446d12 100644
--- a/lib/views/utils/globals.dart
+++ b/lib/utils/globals.dart
@@ -1,3 +1,6 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
 /// Global Objects and State for the Application
 ///
 /// This file contains global keys and objects that are required to be accessed
@@ -8,10 +11,6 @@
 /// - GlobalKey for NavigatorState: Used for navigation in contexts where BuildContext is not available.
 ///
 /// Note: Use globals judiciously as they can lead to tightly coupled code and make testing more difficult.
-library;
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 // Global key for the navigator state to be used for navigation in contexts where BuildContext is not available.
 final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
diff --git a/lib/utils/section_kind.dart b/lib/utils/section_kind.dart
new file mode 100644
index 00000000..61edbb44
--- /dev/null
+++ b/lib/utils/section_kind.dart
@@ -0,0 +1 @@
+enum SectionKind { livestreams, myCourses, publicCourses }
diff --git a/lib/utils/sort_utils.dart b/lib/utils/sort_utils.dart
new file mode 100644
index 00000000..66215efd
--- /dev/null
+++ b/lib/utils/sort_utils.dart
@@ -0,0 +1,81 @@
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:tuple/tuple.dart';
+
+class CourseUtils {
+  static List<String> convertAndSortSemesters(
+    List<Semester> semesters,
+    bool isNewestFirst,
+  ) {
+    List<Semester> sortedSemesters = List<Semester>.from(semesters);
+
+    sortedSemesters.sort((a, b) {
+      int yearComparison = a.year.compareTo(b.year);
+      if (yearComparison != 0) {
+        return isNewestFirst ? -yearComparison : yearComparison;
+      }
+
+      if (a.teachingTerm == b.teachingTerm) {
+        return 0;
+      }
+      return a.teachingTerm == 'W' ? -1 : 1;
+    });
+
+    List<String> semesterStrings = sortedSemesters
+        .map((semester) => "${semester.year} - ${semester.teachingTerm}")
+        .toList();
+
+    // Add 'All' at the beginning of the list
+    semesterStrings.insert(0, 'All');
+
+    return semesterStrings;
+  }
+
+  static List<Course> filterCoursesBySemester(
+    List<Course> courses,
+    String selectedSemester,
+  ) {
+    if (selectedSemester == 'All') {
+      return courses;
+    } else {
+      var parts = selectedSemester.split(' - ');
+      var year = int.parse(parts[0]);
+      var term = parts[1];
+
+      return courses.where((course) {
+        return course.semester.year == year &&
+            course.semester.teachingTerm == term;
+      }).toList();
+    }
+  }
+
+  static void sortCourses(List<Course> courses, String sortOption) {
+    bool isNewestFirst = sortOption == 'Newest First';
+    courses.sort((a, b) {
+      int yearComparison = a.semester.year.compareTo(b.semester.year);
+      if (yearComparison != 0) {
+        return isNewestFirst ? -yearComparison : yearComparison;
+      }
+
+      if (a.semester.teachingTerm == b.semester.teachingTerm) {
+        return 0;
+      }
+      return a.semester.teachingTerm == 'W' ? -1 : 1;
+    });
+  }
+
+  static List<Tuple2<Stream, String>> sortStreams(
+    List<Tuple2<Stream, String>> streamsWithThumb,
+    String sortOption,
+  ) {
+    bool isNewestFirst = sortOption == 'Newest First';
+    streamsWithThumb.sort((a, b) {
+      DateTime startA = a.item1.start.toDateTime();
+      DateTime startB = b.item1.start.toDateTime();
+
+      return isNewestFirst
+          ? startB.compareTo(startA)
+          : startA.compareTo(startB);
+    });
+    return streamsWithThumb;
+  }
+}
diff --git a/lib/utils/theme.dart b/lib/utils/theme.dart
new file mode 100644
index 00000000..93730875
--- /dev/null
+++ b/lib/utils/theme.dart
@@ -0,0 +1,165 @@
+import 'package:flutter/material.dart';
+
+// Define a class for custom colors used throughout the app (Light Theme)
+class AppColors {
+  static const Color primaryColor = Color(0xFF0D47A1); // Colors.blue[900]
+  static const Color primaryTextColor = Colors.black;
+  static const Color secondaryTextColor = Colors.black54;
+  static const Color appBarBackgroundColor = Colors.white;
+  static const Color appBarIconColor = Colors.black;
+  static const Color appBarTextColor = Colors.black;
+  static const Color sectionTitleColor = Colors.black;
+  static const Color indicatorActiveColor = Colors.blue;
+  static const Color linkTextColor = Colors.blue;
+  static const Color inactiveColor = Colors.grey;
+  static const Color tumBlue = Color(0xFF0065BD);
+}
+
+// Define a class for custom colors used throughout the app (Dark Theme)
+class DarkAppColors {
+  static const Color primaryColor = Color(0xFF0D47A1); // Same as light theme
+  static const Color primaryTextColor = Colors.white;
+  static const Color secondaryTextColor = Colors.white70;
+  static const Color appBarBackgroundColor = Colors.black;
+  static const Color appBarIconColor = Colors.white;
+  static const Color appBarTextColor = Colors.white;
+  static const Color sectionTitleColor = Colors.white;
+  static const Color indicatorActiveColor = Colors.blue;
+  static const Color linkTextColor = Colors.lightBlueAccent;
+  static const Color inactiveColor = Color(0xFF757575);
+  static const Color tumBlue = Color(0xFF0065BD);
+}
+
+// Define a class for custom text styles
+class AppTextStyles {
+  static const TextStyle sectionTitle = TextStyle(
+    fontSize: 22,
+    fontWeight: FontWeight.bold,
+    color: AppColors.sectionTitleColor,
+  );
+  static const TextStyle heading = TextStyle(
+    fontSize: 24,
+    fontWeight: FontWeight.bold,
+    color: AppColors.primaryTextColor,
+  );
+  static const TextStyle body = TextStyle(
+    fontSize: 16,
+    color: AppColors.secondaryTextColor,
+  );
+  static const TextStyle link = TextStyle(
+    decoration: TextDecoration.underline,
+    fontSize: 16,
+    color: AppColors.linkTextColor,
+  );
+}
+
+// Define a class for custom text styles (Dark Theme)
+class DarkAppTextStyles {
+  static const TextStyle sectionTitle = TextStyle(
+    fontSize: 22,
+    fontWeight: FontWeight.bold,
+    color: DarkAppColors.sectionTitleColor,
+  );
+  static const TextStyle heading = TextStyle(
+    fontSize: 24,
+    fontWeight: FontWeight.bold,
+    color: DarkAppColors.primaryTextColor,
+  );
+  static const TextStyle body = TextStyle(
+    fontSize: 16,
+    color: DarkAppColors.secondaryTextColor,
+  );
+  static const TextStyle link = TextStyle(
+    decoration: TextDecoration.underline,
+    fontSize: 16,
+    color: DarkAppColors.linkTextColor,
+  );
+}
+
+// Define the app's light theme data
+final ThemeData appTheme = ThemeData(
+  primaryColor: AppColors.primaryColor,
+  scaffoldBackgroundColor: AppColors.appBarBackgroundColor,
+  colorScheme: ColorScheme.fromSwatch().copyWith(
+    primary: AppColors.primaryColor,
+    secondary: AppColors.indicatorActiveColor,
+  ),
+  appBarTheme: const AppBarTheme(
+    color: AppColors.appBarBackgroundColor,
+    iconTheme: IconThemeData(color: AppColors.appBarIconColor),
+    titleTextStyle: TextStyle(
+      color: AppColors.appBarTextColor,
+      fontSize: 20,
+      fontWeight: FontWeight.bold,
+    ),
+  ),
+  textTheme: const TextTheme(
+    titleMedium: AppTextStyles.sectionTitle,
+    displayLarge: AppTextStyles.heading,
+    bodyLarge: AppTextStyles.body,
+    titleSmall: AppTextStyles.link,
+  ),
+  buttonTheme: ButtonThemeData(
+    buttonColor: AppColors.primaryColor,
+    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+    textTheme: ButtonTextTheme.primary,
+  ),
+  inputDecorationTheme: InputDecorationTheme(
+    border: OutlineInputBorder(borderRadius: BorderRadius.circular(8.0)),
+    hintStyle: const TextStyle(
+      color: Colors.grey,
+      fontSize: 14,
+      fontWeight: FontWeight.w500,
+    ),
+    enabledBorder: const OutlineInputBorder(
+      borderSide: BorderSide(color: Colors.grey, width: 1.0),
+    ),
+    focusedBorder: const OutlineInputBorder(
+      borderSide: BorderSide(color: AppColors.primaryColor, width: 2.0),
+    ),
+  ),
+);
+
+// Define the app's dark theme data
+final ThemeData darkAppTheme = ThemeData(
+  primaryColor: DarkAppColors.primaryColor,
+  scaffoldBackgroundColor: DarkAppColors.appBarBackgroundColor,
+  colorScheme: const ColorScheme.dark().copyWith(
+    primary: DarkAppColors.primaryColor,
+    secondary: DarkAppColors.indicatorActiveColor,
+  ),
+  appBarTheme: const AppBarTheme(
+    color: DarkAppColors.appBarBackgroundColor,
+    iconTheme: IconThemeData(color: DarkAppColors.appBarIconColor),
+    titleTextStyle: TextStyle(
+      color: DarkAppColors.appBarTextColor,
+      fontSize: 20,
+      fontWeight: FontWeight.bold,
+    ),
+  ),
+  textTheme: const TextTheme(
+    titleMedium: DarkAppTextStyles.sectionTitle,
+    displayLarge: DarkAppTextStyles.heading,
+    bodyLarge: DarkAppTextStyles.body,
+    titleSmall: DarkAppTextStyles.link,
+  ),
+  buttonTheme: ButtonThemeData(
+    buttonColor: DarkAppColors.primaryColor,
+    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+    textTheme: ButtonTextTheme.primary,
+  ),
+  inputDecorationTheme: InputDecorationTheme(
+    border: OutlineInputBorder(borderRadius: BorderRadius.circular(8.0)),
+    hintStyle: TextStyle(
+      color: Colors.grey[100],
+      fontSize: 14,
+      fontWeight: FontWeight.w500,
+    ),
+    enabledBorder: const OutlineInputBorder(
+      borderSide: BorderSide(color: Color(0xFF757575), width: 1.0),
+    ),
+    focusedBorder: const OutlineInputBorder(
+      borderSide: BorderSide(color: DarkAppColors.primaryColor, width: 2.0),
+    ),
+  ),
+);
diff --git a/lib/view_models/UserViewModel.dart b/lib/view_models/UserViewModel.dart
deleted file mode 100644
index 60a30fcd..00000000
--- a/lib/view_models/UserViewModel.dart
+++ /dev/null
@@ -1,115 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/base/networking/api/handler/auth_handler.dart';
-import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
-import 'package:gocast_mobile/base/networking/api/handler/user_handler.dart';
-import 'package:gocast_mobile/main.dart';
-import 'package:gocast_mobile/models/error/error_model.dart';
-import 'package:gocast_mobile/models/user/user_state_model.dart';
-import 'package:logger/logger.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserViewModel extends StateNotifier<UserState> {
-  final Logger _logger = Logger();
-
-  //BehaviorSubject<bool> isLoading = BehaviorSubject.seeded(false);
-
-  BehaviorSubject<UserState> current =
-      BehaviorSubject.seeded(UserState.defaultConstructor());
-
-  final TextEditingController usernameController = TextEditingController();
-  final TextEditingController passwordController = TextEditingController();
-
-  final GrpcHandler _grpcHandler;
-
-  UserViewModel(this._grpcHandler) : super(UserState.defaultConstructor());
-
-  /// Handles basic authentication.
-  /// This method call the basicAuth method
-  /// If the authentication is successful, it navigates to the courses screen.
-  /// If the authentication fails, it shows an error message.
-  Future<void> handleBasicLogin(BuildContext context) async {
-    await _basicAuth(usernameController.text, passwordController.text).then(
-      (value) => {
-        if (current.value.user != null)
-          {Navigator.pushNamed(context, '/courses')}
-        else
-          {
-            throw AppError.networkError('Authentication failed'),
-          },
-      },
-    );
-  }
-
-  /// Handles SSO authentication.
-  /// This method call the ssoAuth method
-  Future<void> _basicAuth(String email, String password) async {
-    current.value.setIsLoading(true);
-    try {
-      _logger.i('Logging in user with email: $email');
-      await AuthHandler.basicAuth(email, password);
-      await _fetchUser();
-      _logger.i('Logged in user with email: $email');
-      _logger.i('User: ${current.value.user}');
-    } catch (error) {
-      _logger.e(error);
-      current.value.setIsLoading(false);
-      current.addError(error);
-    } finally {
-      current.value.setIsLoading(false); // Stop loading
-    }
-  }
-
-  /// Handles SSO authentication.
-  /// This method call the ssoAuth method
-  Future<void> ssoAuth(BuildContext context, WidgetRef ref) async {
-    current.value.setIsLoading(true); // Start loading
-    try {
-      _logger.i('Logging in user ${current.value.user} with SSO');
-      await AuthHandler.ssoAuth(context, ref);
-      await _fetchUser();
-      _logger.i('Logged in user ${current.value.user} with SSO');
-    } catch (error) {
-      current.value.setIsLoading(false);
-      current.addError(error);
-    } finally {
-      current.value.setIsLoading(false); // Stop loading
-    }
-  }
-
-  Future<void> _fetchUser() async {
-    current.value.setIsLoading(true); // Start loading
-    try {
-      _logger.i('Fetching user');
-      var user = await UserHandler(_grpcHandler).fetchUser();
-      current.value.setUser(user);
-    } catch (error) {
-      current.addError(error);
-    }
-  }
-
-  Future<void> logout() async {
-    current.value.removeUser();
-    current.value = UserState.defaultConstructor();
-
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    await prefs.remove('jwt');
-    _logger.i('Logged out user and cleared tokens.');
-  }
-
-  void clearError() {
-    if (current.hasError) {
-      current = BehaviorSubject.seeded(UserState.defaultConstructor());
-    }
-  }
-
-  void resetControllers() {
-    usernameController.clear();
-    passwordController.clear();
-  }
-}
-
-final userViewModelProvider = StateNotifierProvider<UserViewModel, UserState>(
-  (ref) => UserViewModel(ref.watch(grpcHandlerProvider)),
-);
diff --git a/lib/view_models/chat_view_model.dart b/lib/view_models/chat_view_model.dart
new file mode 100644
index 00000000..4ff37e79
--- /dev/null
+++ b/lib/view_models/chat_view_model.dart
@@ -0,0 +1,138 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/chat_handler.dart';
+
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/models/chat/chat_state_model.dart';
+
+class ChatViewModel extends StateNotifier<ChatState> {
+  final GrpcHandler _grpcHandler;
+
+  ChatViewModel(this._grpcHandler) : super(const ChatState());
+
+  Future<void> fetchChatMessages(int streamId) async {
+    state = state.copyWith(isLoading: true);
+    state = state.clearError();
+    try {
+      final messages =
+          await ChatHandlers(_grpcHandler).getChatMessages(streamId);
+      state = state.copyWith(messages: messages, isLoading: false, accessDenied: false);
+    } catch (e) {
+      state = state.copyWith(
+        error: e as AppError,
+        isLoading: false,
+        accessDenied: true,
+      );
+    }
+  }
+
+  Future<void> updateMessages(int streamId) async {
+    state = state.copyWith(isLoading: true);
+    state = state.clearError();
+    if(state.messages == null) {
+     fetchChatMessages(streamId);
+    }else {
+      try {
+        final messages = await ChatHandlers(_grpcHandler).getChatMessages(streamId);
+        final combinedMessages = List<ChatMessage>.from(state.messages ?? [])
+          ..addAll(messages.where((newMessage) => !state.messages!.contains(newMessage)));
+        state = state.copyWith(messages: combinedMessages, isLoading: false, accessDenied: false);
+      } catch (e) {
+        state = state.copyWith(
+          error: e as AppError,
+          isLoading: false,
+          accessDenied: true,
+        );
+      }
+    }
+  }
+
+  Future<void> postChatMessage(int streamId, String message) async {
+    try {
+      fetchChatMessages(streamId);
+      var chatMessage =
+          await ChatHandlers(_grpcHandler).postChatMessage(streamId, message);
+      state = state.addMessage(chatMessage);
+    } catch (e) {
+      if (_isRateLimitError(e)) {
+        state = state.copyWith(isRateLimitReached: true);
+        await Future.delayed(const Duration(seconds: 10));
+        if (mounted) {
+          state = state.copyWith(isRateLimitReached: false);
+        }
+      } else if (_isCoolDownError(e)) {
+        state = state.copyWith(isCoolDown: true);
+        await Future.delayed(const Duration(seconds: 30));
+        if (mounted) {
+          state = state.copyWith(isCoolDown: false);
+        }
+      } else {
+        state = state.copyWith(error: e as AppError);
+      }
+    }
+  }
+
+  Future<void> postMessageReaction(int messageId, int streamId,
+      String emoji,) async {
+    try {
+      var reaction = await ChatHandlers(_grpcHandler)
+          .postMessageReaction(messageId, streamId, emoji);
+      state = state.addReaction(reaction);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError);
+    }
+  }
+
+  Future<void> deleteMessageReaction(int messageId, int streamId,
+      int reactionId,) async {
+    try {
+      await ChatHandlers(_grpcHandler)
+          .deleteMessageReaction(messageId, streamId, reactionId);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError);
+    }
+  }
+
+  Future<void> postChatReply(int messageId, int streamId,
+      String message,) async {
+    try {
+      var replay = await ChatHandlers(_grpcHandler)
+          .postChatReply(messageId, streamId, message);
+      state = state.addReply(replay);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError);
+    }
+  }
+
+  Future<void> markChatMessageAsResolved(int messageId, int streamId) async {
+    try {
+      await ChatHandlers(_grpcHandler)
+          .markChatMessageAsResolved(messageId, streamId);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError);
+    }
+  }
+
+  Future<void> markChatMessageAsUnresolved(int messageId, int streamId) async {
+    try {
+      await ChatHandlers(_grpcHandler)
+          .markChatMessageAsUnresolved(messageId, streamId);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError);
+    }
+  }
+
+  void clearError() {
+    state = state.clearError();
+  }
+
+
+  bool _isRateLimitError(dynamic error) {
+    return error.toString().contains("posting too fast");
+  }
+
+  bool _isCoolDownError(dynamic error) {
+    return error.toString().contains("cooled down");
+  }
+}
diff --git a/lib/view_models/course_view_model.dart b/lib/view_models/course_view_model.dart
new file mode 100644
index 00000000..cb7f676c
--- /dev/null
+++ b/lib/view_models/course_view_model.dart
@@ -0,0 +1,34 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/course_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/models/course/course_state_model.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+
+class CourseViewModel extends StateNotifier<CourseState> {
+  final GrpcHandler _grpcHandler;
+
+  CourseViewModel(this._grpcHandler) : super(const CourseState());
+
+  Future<List<Course>> fetchAllCourses() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      final courses = await CourseHandler(_grpcHandler).fetchAllCourses();
+      state = state.copyWith(allCourses: courses, isLoading: false);
+      return courses;
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+      return [];
+    }
+  }
+
+  Future<Course> getCourseWithID(int courseID) async {
+    if (state.allCourses == null) {
+      await fetchAllCourses();
+    }
+    var course =
+        state.allCourses!.firstWhere((course) => course.id == courseID);
+    state = state.copyWith(course: course);
+    return course;
+  }
+}
diff --git a/lib/view_models/download_view_model.dart b/lib/view_models/download_view_model.dart
new file mode 100644
index 00000000..576fa2af
--- /dev/null
+++ b/lib/view_models/download_view_model.dart
@@ -0,0 +1,171 @@
+import 'dart:convert';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/models/download/download_state_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:dio/dio.dart';
+import 'package:logger/logger.dart';
+import 'dart:io';
+
+class DownloadViewModel extends StateNotifier<DownloadState> {
+  final Logger _logger = Logger();
+
+  DownloadViewModel() : super(const DownloadState()) {
+    initDownloads();
+  }
+
+  bool isStreamDownloaded(int id) {
+    final int streamIdInt = id.toInt(); // Convert Int64 to int
+    return state.downloadedVideos.containsKey(streamIdInt);
+  }
+
+
+  Future<void> initDownloads() async {
+    final prefs = await SharedPreferences.getInstance();
+    final jsonString = prefs.getString('downloadedVideos');
+    if (jsonString != null) {
+      final downloaded = Map<String, dynamic>.from(json.decode(jsonString));
+      final downloadedVideos = downloaded.map((key, value) {
+        // Decode the JSON string into a Map
+        final videoDetailsMap = json.decode(value);
+        // Create a VideoDetails object from the Map
+        final videoDetails = VideoDetails(
+          filePath: videoDetailsMap['filePath'],
+          name: videoDetailsMap['name'],
+          duration: videoDetailsMap['duration'],
+          description: videoDetailsMap['description'],
+        );
+        return MapEntry(int.parse(key), videoDetails);
+      }).cast<int, VideoDetails>(); // Ensure the map has the correct type
+      state = state.copyWith(downloadedVideos: downloadedVideos);
+    }
+  }
+
+  Future<String> downloadVideo(String videoUrl, int streamId, String fileName,
+      String streamName, int streamDuration, String description,) async {
+    try {
+      final directory = await getApplicationDocumentsDirectory();
+      final filePath = '${directory.path}/$fileName';
+      Dio dio = Dio();
+      await dio.download(videoUrl, filePath);
+      _logger.d('Downloaded video to: $filePath');
+
+      final prefs = await SharedPreferences.getInstance();
+      final int streamIdInt = streamId.toInt();
+
+      // Create a map for the video details
+      final videoDetailsMap = {
+        'filePath': filePath,
+        'name': streamName,
+        'duration': streamDuration,
+        'description': description,
+      };
+
+      // Convert video details map to JSON string
+      final videoDetailsJson = json.encode(videoDetailsMap);
+
+      // Save the JSON string in your SharedPreferences
+      final downloadedVideosJson = Map<int, String>.from(state.downloadedVideos)
+        ..[streamIdInt] = videoDetailsJson;
+
+      await prefs.setString(
+        'downloadedVideos',
+        json.encode(downloadedVideosJson.map((key, value) =>
+            MapEntry(key.toString(), value),),),
+      );
+
+      // Convert the JSON strings back to VideoDetails objects for the state
+      final downloadedVideos = downloadedVideosJson.map((key, value) {
+        final videoDetailsMap = json.decode(value);
+        final videoDetails = VideoDetails(
+          filePath: videoDetailsMap['filePath'],
+          name: videoDetailsMap['name'],
+          duration: videoDetailsMap['duration'],
+          description: videoDetailsMap['description'],
+        );
+        return MapEntry(key, videoDetails);
+      }).cast<int, VideoDetails>();
+
+      // Update the state
+      state = state.copyWith(downloadedVideos: downloadedVideos);
+      _logger.d('Downloaded videos: ${state.downloadedVideos}');
+      return filePath;
+    } catch (e) {
+      _logger.e("Error downloading video: $e");
+      return '';
+    }
+  }
+
+  Future<void> fetchDownloadedVideos() async {
+    try {
+      _logger.d('Downloaded videos: ${state.downloadedVideos.keys}');
+    } catch (e) {
+      _logger.e('Error fetching downloaded videos: $e');
+    }
+  }
+
+  Future<void> deleteDownload(int videoId) async {
+    _logger.i('Deleting downloaded video with ID: $videoId');
+
+    try {
+      // Get the VideoDetails object from the state
+      VideoDetails? videoDetails = state.downloadedVideos[videoId];
+      if (videoDetails != null) {
+        final filePath = videoDetails.filePath;
+        final file = File(filePath);
+        if (await file.exists()) {
+          await file.delete();
+          _logger.d('Deleted video file at: $filePath');
+        } else {
+          _logger.w('File not found: $filePath');
+        }
+
+        final prefs = await SharedPreferences.getInstance();
+        final updatedDownloads = Map<int, VideoDetails>.from(
+            state.downloadedVideos,);
+        updatedDownloads.remove(videoId);
+
+        // Save updated list to SharedPreferences
+        // Convert VideoDetails objects to JSON strings before saving
+        await prefs.setString(
+          'downloadedVideos',
+          json.encode(updatedDownloads.map((key, value) =>
+              MapEntry(key.toString(), json.encode(value)),),)
+          ,);
+        state = state.copyWith(downloadedVideos: updatedDownloads);
+      }
+    }
+    catch (e) {
+    _logger.e('Error deleting video with ID $videoId: $e');
+    }
+  }
+
+
+  Future<void> deleteAllDownloads() async {
+    _logger.i('Deleting all downloaded videos');
+
+    try {
+      final directory = await getApplicationDocumentsDirectory();
+      final files = Directory(directory.path).listSync();
+
+      for (final file in files) {
+        if (file is File && file.path.endsWith('.mp4')) {
+          await file.delete();
+          _logger.d('Deleted video file at: ${file.path}');
+        }
+      }
+
+      final prefs = await SharedPreferences.getInstance();
+      // Clear the downloaded videos map in SharedPreferences
+      await prefs.remove('downloadedVideos');
+      // Clear the downloaded videos map in the state
+      state = state.copyWith(downloadedVideos: {});
+      _logger.i('All downloaded videos have been deleted');
+    } catch (e) {
+      _logger.e('Error deleting all videos: $e');
+    }
+  }
+
+
+}
+
diff --git a/lib/view_models/notification_view_model.dart b/lib/view_models/notification_view_model.dart
new file mode 100644
index 00000000..1b653549
--- /dev/null
+++ b/lib/view_models/notification_view_model.dart
@@ -0,0 +1,171 @@
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/notification_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/token_handler.dart';
+import 'package:gocast_mobile/main.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/models/notifications/notification_state_model.dart';
+import 'package:gocast_mobile/models/notifications/push_notification.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/globals.dart';
+import 'package:logger/logger.dart';
+
+class NotificationViewModel extends StateNotifier<NotificationState> {
+  final Logger _logger = Logger();
+  final GrpcHandler _grpcHandler;
+
+  NotificationViewModel(this._grpcHandler) : super(const NotificationState());
+
+  /// Create instance of FCM
+  final _firebaseMessaging = FirebaseMessaging.instance;
+
+  /// Function to initialize notifications
+  Future<void> initPushNotifications() async {
+    // Request permission from user
+    await _firebaseMessaging.requestPermission();
+
+    String? deviceToken;
+    try {
+      deviceToken = await _firebaseMessaging.getToken();
+    }catch(e){
+      throw AppError.notificationNotAvailableYet();
+    }
+    // Send device_token to API
+    if (deviceToken != null) await postDeviceToken(deviceToken);
+
+    // App was terminated and now openen
+    FirebaseMessaging.instance.getInitialMessage().then(handleMessage);
+
+    // Attach event listener for notification opening the app
+    FirebaseMessaging.onMessageOpenedApp.listen(handleMessage);
+  }
+
+  /// Function to handle received messages
+  handleMessage(RemoteMessage? message) {
+    _logger.e("HandleMessage: $message");
+    if (message == null) return;
+
+    final msg = message.data['msg'];
+    final sum = message.data['sum'];
+
+    if (msg != null && sum != null) {
+      PushNotification notification = PushNotification(
+        body: msg,
+        title: sum,
+        receivedAt: DateTime.now(),
+        data: message.data,
+      );
+      addNotification(notification);
+    }
+  }
+
+  addNotification(PushNotification notification) {
+    _logger.i('Adding push notification');
+    var pushNotifications = state.pushNotifications;
+
+    pushNotifications ??= [];
+    pushNotifications.add(notification);
+
+    state = state.copyWith(pushNotifications: pushNotifications);
+    _logger.w("PushNotifications = ${pushNotifications.length}");
+  }
+
+  void handleUploadNotifications(ref) {
+    FirebaseMessaging messaging = FirebaseMessaging.instance;
+    messaging.requestPermission();
+
+    final nvmn = ref.read(notificationViewModelProvider.notifier);
+
+    if (!isPushNotificationListenerSet) {
+      FirebaseMessaging.onMessage.listen((RemoteMessage message) {
+        final msg = message.data['msg'];
+        final sum = message.data['sum'];
+
+        if (msg != null && sum != null) {
+          PushNotification notification = PushNotification(
+            body: msg,
+            title: sum,
+            receivedAt: DateTime.now(),
+            data: message.data,
+          );
+          nvmn.addNotification(notification);
+          showDialog(
+            context: navigatorKey.currentContext!,
+            builder: (BuildContext context) {
+              return AlertDialog(
+                title: Text(notification.title),
+                content: SingleChildScrollView(
+                  child: ListBody(
+                    children: <Widget>[
+                      Text(notification.body),
+                    ],
+                  ),
+                ),
+              );
+            },
+          );
+        }
+      });
+
+      // Handle incoming messages when the app is in the background but visible
+      FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
+        debugPrint('TODO: A new onMessageOpenedApp event was published!');
+      });
+      isPushNotificationListenerSet = true;
+    }
+  }
+
+  Future<void> postDeviceToken(String deviceToken) async {
+    try {
+      TokenHandler.saveToken("device_token", deviceToken);
+      _logger.i('Posting device token');
+      await NotificationHandler(_grpcHandler).postDeviceToken(deviceToken);
+    } catch (e) {
+      _logger.e(e);
+    }
+  }
+
+  Future<void> deleteDeviceToken() async {
+    try {
+      var deviceToken = await TokenHandler.loadTokenNoException("device_token");
+      const storage = FlutterSecureStorage();
+      await storage.delete(key: 'device_token');
+      _logger.i('Deleting device token');
+      await NotificationHandler(_grpcHandler).deleteDeviceToken(deviceToken);
+    } catch (e) {
+      _logger.e(e);
+    }
+  }
+
+  Future<void> fetchFeatureNotifications() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      _logger.i('Fetching feature notifications');
+      var featureNotifications =
+          await NotificationHandler(_grpcHandler).fetchFeatureNotifications();
+      state = state.copyWith(
+        featureNotifications: featureNotifications,
+        isLoading: false,
+      );
+    } catch (e) {
+      _logger.e(e);
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> fetchBannerAlerts() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      _logger.i('Fetching banner alerts');
+      var bannerAlerts =
+          await NotificationHandler(_grpcHandler).fetchBannerAlerts();
+      state = state.copyWith(bannerAlerts: bannerAlerts, isLoading: false);
+    } catch (e) {
+      _logger.e(e);
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+}
diff --git a/lib/view_models/pinned_view_model.dart b/lib/view_models/pinned_view_model.dart
new file mode 100644
index 00000000..34baae90
--- /dev/null
+++ b/lib/view_models/pinned_view_model.dart
@@ -0,0 +1,118 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/pinned_handler.dart';
+import 'package:gocast_mobile/models/course/pinned_course_state_model.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/utils/sort_utils.dart';
+import 'package:logger/logger.dart';
+
+class PinnedViewModel extends StateNotifier<PinnedCourseState> {
+  final Logger _logger = Logger();
+
+  final GrpcHandler _grpcHandler;
+
+  PinnedViewModel(this._grpcHandler) : super(const PinnedCourseState());
+
+  Future<void> fetchUserPinned() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      var courses = await PinnedHandler(_grpcHandler).fetchUserPinned();
+      state = state.copyWith(userPinned: courses, isLoading: false);
+      setUpDisplayedPinnedCourses(state.userPinned ?? []);
+    } catch (e) {
+      _logger.e(e);
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+
+  Future<bool> pinCourse(int courseID) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      bool success = await PinnedHandler(_grpcHandler).pinCourse(courseID);
+      if (success) {
+        await fetchUserPinned();
+      } else {
+        _logger.e('Failed to pin course');
+      }
+      state = state.copyWith(isLoading: false);
+      return success;
+    } catch (e) {
+      _logger.e('Error pinning course: $e');
+      state = state.copyWith(error: e as AppError, isLoading: false);
+      return false;
+    }
+  }
+
+
+  Future<bool> unpinCourse(int courseID) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      bool success = await PinnedHandler(_grpcHandler).unpinCourse(courseID);
+      if (success) {
+        await fetchUserPinned();
+        _logger.i('Course unpinned successfully');
+      } else {
+        _logger.e('Failed to unpin course');
+      }
+      state = state.copyWith(isLoading: false);
+      return success;
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+      return false;
+    }
+  }
+
+  void updateSelectedPinnedSemester(String? semester, List<Course> allCourses) {
+    state = state.copyWith(selectedSemester: semester);
+    updatedDisplayedPinnedCourses(
+      CourseUtils.filterCoursesBySemester(
+        allCourses,
+        state.selectedSemester ?? 'All',
+      ),
+    );
+  }
+
+  void updatedDisplayedPinnedCourses(List<Course> displayedPinnedCourses) {
+    state = state.copyWith(displayedPinnedCourses: displayedPinnedCourses);
+  }
+
+  void setUpDisplayedPinnedCourses(List<Course> allCourses) {
+    CourseUtils.sortCourses(allCourses, 'Newest First');
+    updatedDisplayedPinnedCourses(
+      CourseUtils.filterCoursesBySemester(
+        allCourses,
+        state.selectedSemester ?? 'All',
+      ),
+    );
+  }
+
+  bool isCoursePinned(int id) {
+    if (state.userPinned == null) {
+      return false;
+    }
+    for (var course in state.userPinned!) {
+      if (course.id == id) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  void setLoading(bool loading) {
+    state = state.copyWith(isLoading: loading);
+  }
+
+  void setSemestersAsString(List<Semester> semesters) {
+    state = state.copyWith(
+      semestersAsString: CourseUtils.convertAndSortSemesters(semesters, true),
+    );
+  }
+
+  void setSelectedSemester(String choice) {
+    state = state.copyWith(selectedSemester: choice);
+  }
+
+
+}
\ No newline at end of file
diff --git a/lib/view_models/poll_view_model.dart b/lib/view_models/poll_view_model.dart
new file mode 100644
index 00000000..ce055acf
--- /dev/null
+++ b/lib/view_models/poll_view_model.dart
@@ -0,0 +1,51 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/handler/poll_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/models/poll/poll_state_model.dart'; // Make sure to create this file
+
+class PollViewModel extends StateNotifier<PollState> {
+  final GrpcHandler _grpcHandler;
+
+  PollViewModel(this._grpcHandler) : super(const PollState());
+
+  Future<void> fetchPolls(int streamId) async {
+    state = state.copyWith(isLoading: true);
+    state = state.clearError();
+    try {
+      final polls = await PollHandlers(_grpcHandler).getPolls(streamId);
+      state = state.copyWith(polls: polls, isLoading: false);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> postPollVote(int streamId, int pollOptionId) async {
+    try {
+      await PollHandlers(_grpcHandler).postPollVote(streamId, pollOptionId);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError);
+    }
+  }
+
+  void postAnsweredPoll(int pollId, int pollOptionId) {
+    state = state.addAnsweredPoll(pollId, pollOptionId);
+  }
+
+  void getAnsweredPolls() {
+    Map<int, int> answeredPolls = {};
+    for (var poll in state.polls ?? []) {
+      for (var option in poll.pollOptions) {
+        if (option.voted) {
+          answeredPolls[poll.id] = option.id;
+          break;
+        }
+      }
+    }
+    state = state.copyWith(answeredPolls: answeredPolls);
+  }
+
+  void clearError() {
+    state = state.clearError();
+  }
+}
diff --git a/lib/view_models/setting_view_model.dart b/lib/view_models/setting_view_model.dart
new file mode 100644
index 00000000..4df36444
--- /dev/null
+++ b/lib/view_models/setting_view_model.dart
@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/settings_handler.dart';
+import 'package:gocast_mobile/models/settings/setting_state_model.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:logger/logger.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class SettingViewModel extends StateNotifier<SettingState> {
+  final GrpcHandler _grpcHandler;
+
+  SettingViewModel(this._grpcHandler) : super(const SettingState());
+
+  Future<void> fetchUserSettings() async {
+      final userSettings =
+          await SettingsHandler(_grpcHandler).fetchUserSettings();
+      state = state.copyWith(userSettings: userSettings);
+  }
+
+  Future<void> updateUserSettings(List<UserSetting> updatedSettings) async {
+
+      final success = await SettingsHandler(_grpcHandler)
+          .updateUserSettings(updatedSettings);
+      if (success) {
+        state = state.copyWith(userSettings: updatedSettings);
+      } else {
+        Logger().e('Failed to update user settings');
+      }
+  }
+
+  Future<void> loadPreferences() async {
+    final prefs = await SharedPreferences.getInstance();
+    await loadThemePreference(prefs);
+    await loadNotificationPreference(prefs);
+    await fetchUserSettings();
+  }
+
+  Future<void> loadThemePreference(SharedPreferences prefs) async {
+    // Default to 'system' if no preference is set
+    final themePreference = prefs.getString('themeMode') ?? 'system';
+    updateThemeMode(themePreference);
+  }
+
+  Future<void> saveThemePreference(String theme, WidgetRef ref) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString('themeMode', theme);
+    updateThemeMode(theme);
+
+    // Update the UI theme mode based on the selected preference
+    ref.read(themeModeProvider.notifier).state = theme == 'dark'
+        ? ThemeMode.dark
+        : theme == 'light'
+            ? ThemeMode.light
+            : ThemeMode.system;
+  }
+
+  void updateThemeMode(String themePreference) {
+    // Update the state with the new theme preference
+    state = state.copyWith(
+      isDarkMode: themePreference == 'dark',
+      isLightMode: themePreference == 'light',
+      isSystemDefault: themePreference == 'system',
+    );
+  }
+
+  Future<void> loadNotificationPreference(SharedPreferences prefs) async {
+    final notificationPreference = prefs.getBool('notifications') ?? true;
+    state = state.copyWith(isPushNotificationsEnabled: notificationPreference);
+  }
+
+  Future<void> saveNotificationPreference(bool value) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('notifications', value);
+    state = state.copyWith(isPushNotificationsEnabled: value);
+  }
+
+  Future<void> saveDownloadWifiOnlyPreference(bool value) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('downloadWifiOnly', value);
+    state = state.copyWith(isDownloadWithWifiOnly: value);
+  }
+
+  // This static method can stay within UserViewModel as it doesn't interact with the API
+  static List<double> getDefaultSpeeds() {
+    return List<double>.generate(14, (i) => (i + 1) * 0.25);
+  }
+
+  Future<void> updatePreferredGreeting(String newGreeting) async {
+      await SettingsHandler(_grpcHandler).updateGreeting(newGreeting);
+      await fetchUserSettings();
+  }
+
+  Future<bool> updatePreferredName(String newName) async {
+    try {
+      await SettingsHandler(_grpcHandler).updatePreferredName(newName);
+      await fetchUserSettings();
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  Future<void> updateSelectedSpeeds(double speed, bool isSelected) async {
+    await SettingsHandler(_grpcHandler)
+        .updateSelectedSpeeds(speed, isSelected, state.userSettings ?? []);
+    await fetchUserSettings();
+  }
+
+  List<double> parsePlaybackSpeeds() {
+    return SettingsHandler(_grpcHandler)
+        .parsePlaybackSpeeds(state.userSettings);
+  }
+
+  List<UserSetting>? getUserSettings() {
+    return state.userSettings;
+  }
+
+  void setLoading(bool isLoading) {
+    state = state.copyWith(isLoading: isLoading);
+  }
+
+}
diff --git a/lib/view_models/stream_view_model.dart b/lib/view_models/stream_view_model.dart
new file mode 100644
index 00000000..c399c47c
--- /dev/null
+++ b/lib/view_models/stream_view_model.dart
@@ -0,0 +1,235 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/stream_handler.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/models/video/stream_state_model.dart';
+import 'package:gocast_mobile/utils/sort_utils.dart';
+import 'package:logger/logger.dart';
+import 'package:tuple/tuple.dart';
+
+class StreamViewModel extends StateNotifier<StreamState> {
+  final GrpcHandler _grpcHandler;
+
+  StreamViewModel(this._grpcHandler) : super(const StreamState());
+
+  Future<void> fetchCourseStreams(int courseID) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      final streams =
+          await StreamHandler(_grpcHandler).fetchCourseStreams(courseID);
+      state = state.copyWith(streams: streams, isLoading: false);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+
+
+  void updatedDisplayedStreams(List<Tuple2<Stream, String>> allStreams) {
+    state = state.copyWith(displayedStreams: allStreams);
+  }
+
+  void setUpDisplayedCourses(List<Tuple2<Stream, String>> allStreams) {
+    updatedDisplayedStreams(
+      CourseUtils.sortStreams(allStreams, state.selectedFilterOption),
+    );
+  }
+
+  void updateSelectedFilterOption(
+    String option,
+    List<Tuple2<Stream, String>> allStreams,
+  ) {
+    state = state.copyWith(selectedFilterOption: option);
+    updatedDisplayedStreams(
+      CourseUtils.sortStreams(allStreams, state.selectedFilterOption),
+    );
+  }
+
+  /// This asynchronous function fetches thumbnails for all available streams in the current state.
+  /// only if there are streams in the current state.
+  /// It initiates fetching of thumbnails for each stream by invoking `fetchThumbnailForStream`.
+  Future<void> fetchThumbnails() async {
+    if (state.streams == null) {
+      return;
+    }
+    var fetchThumbnailTasks = <Future<Tuple2<Stream, String>>>[];
+    for (var stream in state.streams!) {
+      fetchThumbnailTasks.add(
+        fetchThumbnailForStream(stream)
+            .then((thumbnail) => Tuple2(stream, thumbnail)),
+      );
+    }
+
+    var fetchedStreamsWithThumbnails = await Future.wait(fetchThumbnailTasks);
+    state = state.copyWith(
+      streamsWithThumb: fetchedStreamsWithThumbnails,
+      isLoading: false,
+    );
+    setUpDisplayedCourses(fetchedStreamsWithThumbnails);
+  }
+
+  /// This asynchronous function fetches thumbnails for all available live streams in the current state.
+  /// only if there are live streams in the current state.
+  /// It initiates fetching of thumbnails for each live stream by invoking `fetchThumbnailForStream`.
+  Future<void> fetchLiveThumbnails() async {
+    if (state.liveStreams == null) {
+      return;
+    }
+    var fetchLiveThumbnailTasks = <Future<Tuple2<Stream, String>>>[];
+    for (var stream in state.liveStreams!) {
+      fetchLiveThumbnailTasks.add(
+        fetchStreamThumbnail(stream.id)
+            .then((thumbnail) => Tuple2(stream, thumbnail)),
+      );
+    }
+    var fetchedStreamsWithThumbnails =
+        await Future.wait(fetchLiveThumbnailTasks);
+    state = state.copyWith(
+      liveStreamsWithThumb: fetchedStreamsWithThumbnails,
+      isLoading: false,
+    );
+  }
+
+  /// Fetches a thumbnail for a given stream.
+  /// Parameters:
+  ///   [stream] - The stream object for which the thumbnail needs to be fetched.
+  Future<String> fetchThumbnailForStream(Stream stream) async {
+    try {
+      return await (stream.liveNow
+          ? fetchStreamThumbnail(stream.id)
+          : fetchVODThumbnail(stream.id));
+    } catch (e) {
+      return '/thumb-fallback.png'; // Fallback thumbnail
+    }
+  }
+
+  /// Fetches the thumbnail for a live stream.
+  /// Parameters:
+  ///   [streamId] - The identifier of the stream.
+  Future<String> fetchStreamThumbnail(int streamId) async {
+    try {
+      return await StreamHandler(_grpcHandler).fetchThumbnailStreams(streamId);
+    } catch (e) {
+      Logger().e(e);
+      rethrow;
+    }
+  }
+
+  /// Fetches the thumbnail for a recorded stream.
+  /// Parameters:
+  ///   [streamId] - The identifier of the stream.
+  Future<String> fetchVODThumbnail(int streamId) async {
+    try {
+      return await StreamHandler(_grpcHandler).fetchThumbnailVOD(streamId);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<void> fetchStream(int streamId) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      final stream = await StreamHandler(_grpcHandler).fetchStream(streamId);
+      state = state.copyWith(streams: [stream], isLoading: false);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> fetchLiveNowStreams() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      final streams = await StreamHandler(_grpcHandler).fetchLiveNowStreams();
+      state = state.copyWith(liveStreams: streams, isLoading: false);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> fetchProgress(int streamId) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      final progress =
+          await StreamHandler(_grpcHandler).fetchProgress(streamId);
+      state = state.copyWith(progress: progress, isLoading: false);
+    } catch (e) {
+      state = state.copyWith(
+        error: e as AppError,
+        isLoading: false,
+        progress: Progress(progress: 0.0),
+      );
+    }
+  }
+
+  Future<Progress> fetchProgressForStream(int streamId) async {
+    try {
+      final progress =
+          await StreamHandler(_grpcHandler).fetchProgress(streamId);
+      return progress;
+    } catch (e) {
+      return Progress(progress: 0.0);
+    }
+  }
+
+  Future<void> updateProgress(int streamId, Progress progress) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      await StreamHandler(_grpcHandler).putProgress(streamId, progress);
+      state = state.copyWith(isLoading: false, progress: progress);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> markAsWatched(int streamId) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      await StreamHandler(_grpcHandler).markAsWatched(streamId);
+      state = state.copyWith(isLoading: false, isWatched: true);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  void setVideoSource(String videoSource) {
+    state = state.copyWith(videoSource: videoSource);
+  }
+
+  void clearState() {
+    state = const StreamState();
+  }
+
+  void clearError() {
+    state = state.clearError();
+  }
+
+  void resetProgress() {
+    state = state.copyWith(progress: null);
+  }
+
+  void resetVideoSource() {
+    state = state.copyWith(videoSource: null);
+  }
+
+  void resetWatched() {
+    state = state.copyWith(isWatched: false);
+  }
+
+  void resetThumbnails() {
+    state = state.copyWith(thumbnails: null);
+  }
+
+  void resetStreams() {
+    state = state.copyWith(streams: null);
+  }
+
+  void switchVideoSource(String newPlaylistUrl) {
+    state = state.switchVideoSource(newPlaylistUrl);
+  }
+
+  void setProgress(double savedProgress) {
+    state = state.copyWith(progress: Progress(progress: savedProgress));
+  }
+}
diff --git a/lib/view_models/user_view_model.dart b/lib/view_models/user_view_model.dart
new file mode 100644
index 00000000..7be382ad
--- /dev/null
+++ b/lib/view_models/user_view_model.dart
@@ -0,0 +1,179 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/base/networking/api/handler/auth_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/course_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/grpc_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/token_handler.dart';
+import 'package:gocast_mobile/base/networking/api/handler/user_handler.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/models/user/user_state_model.dart';
+import 'package:gocast_mobile/utils/globals.dart';
+import 'package:gocast_mobile/utils/sort_utils.dart';
+import 'package:jwt_decode/jwt_decode.dart';
+import 'package:logger/logger.dart';
+
+class UserViewModel extends StateNotifier<UserState> {
+  final Logger _logger = Logger();
+
+  final GrpcHandler _grpcHandler;
+
+  UserViewModel(this._grpcHandler) : super(const UserState()){
+    // Check if the user is already logged in
+    _checkToken();
+  }
+
+
+  /// Handles basic authentication.
+  /// If the authentication is successful, it navigates to the courses screen.
+  /// If the authentication fails, it shows an error message.
+  Future<void> handleBasicLogin(String email, String password) async {
+    state = state.reset();
+    try {
+      state = state.copyWith(isLoading: true);
+      await AuthHandler.basicAuth(email, password);
+      await fetchUser();
+      if (state.user != null) {
+        navigatorKey.currentState?.pushNamed('/navigationTab');
+      }
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  /// Handles SSO authentication.
+  Future<void> ssoAuth(BuildContext context, WidgetRef ref) async {
+    state = state.copyWith(isLoading: true);
+    try {
+      _logger.i('Logging in user with SSO');
+      await AuthHandler.ssoAuth(context, ref);
+      await fetchUser();
+      _logger.i('Logged in user with SSO');
+      state = state.copyWith(isLoading: false);
+    } catch (e) {
+      _logger.e(e);
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> fetchUser() async {
+    try {
+      var user = await UserHandler(_grpcHandler).fetchUser();
+      state = state.copyWith(user: user, isLoading: false);
+    } catch (e) {
+      _logger.e(e);
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+
+  Future<void> logout() async {
+    await TokenHandler.deleteToken('jwt');
+    await TokenHandler.deleteToken('device_token');
+    await TokenHandler.deleteToken('jwt_token');
+    state=state.reset();
+    _logger.i('Logged out user and cleared tokens.');
+  }
+
+  void setLoading(bool loading) {
+    state = state.copyWith(isLoading: loading);
+  }
+
+  Future<void> fetchSemesters() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      var semesters = await CourseHandler(_grpcHandler).fetchSemesters();
+      semesters.item1.add(semesters.item2);
+      state = state.copyWith(current: semesters.item2, isLoading: false);
+      state = state.copyWith(semesters: semesters.item1, isLoading: false);
+
+      setSemestersAsString(semesters.item1);
+      String current =
+          "${semesters.item2.year} - ${semesters.item2.teachingTerm}";
+      state = state.copyWith(currentAsString: current);
+      updateSelectedSemester(current, []);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> fetchPublicCourses() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      var courses = await CourseHandler(_grpcHandler).fetchPublicCourses();
+      state = state.copyWith(publicCourses: courses, isLoading: false);
+      setUpDisplayedCourses(state.publicCourses ?? []);
+    } catch (e) {
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  Future<void> fetchUserCourses() async {
+    state = state.copyWith(isLoading: true);
+    try {
+      var courses = await UserHandler(_grpcHandler).fetchUserCourses();
+      state = state.copyWith(userCourses: courses, isLoading: false);
+      setUpDisplayedCourses(state.userCourses ?? []);
+    } catch (e) {
+      _logger.e(e);
+      state = state.copyWith(error: e as AppError, isLoading: false);
+    }
+  }
+
+  void updateSelectedSemester(String? semester, List<Course> allCourses) {
+    state = state.copyWith(selectedSemester: semester);
+    updatedDisplayedCourses(
+      CourseUtils.filterCoursesBySemester(
+        allCourses,
+        state.selectedSemester ?? 'All',
+      ),
+    );
+  }
+
+  void setSemestersAsString(List<Semester> semesters) {
+    state = state.copyWith(
+      semestersAsString: CourseUtils.convertAndSortSemesters(semesters, true),
+    );
+  }
+
+  void updatedDisplayedCourses(List<Course> displayedCourses) {
+    state = state.copyWith(displayedCourses: displayedCourses);
+  }
+
+
+  void setUpDisplayedCourses(List<Course> allCourses) {
+    CourseUtils.sortCourses(allCourses, 'Newest First');
+    updatedDisplayedCourses(
+      CourseUtils.filterCoursesBySemester(
+        allCourses,
+        state.selectedSemester ?? 'All',
+      ),
+    );
+  }
+
+  void setSelectedSemester(String choice) {
+    state = state.copyWith(selectedSemester: choice);
+  }
+
+  Future<void> _checkToken() async {
+    String token = await _getToken();
+    if(token.isNotEmpty && !Jwt.isExpired(token)) {
+      _logger.i('Token found, fetching user: $token');
+      fetchUser();
+    }else {
+      _logger.i('Token not found or expired');
+    }
+  }
+
+  Future<String> _getToken() async {
+    try {
+      return await TokenHandler.loadToken('jwt');
+    } catch(e){
+      Logger().w("Token not found");
+      return '';
+    }
+  }
+
+}
diff --git a/lib/views/chat_view/chat_view.dart b/lib/views/chat_view/chat_view.dart
new file mode 100644
index 00000000..5abf8a7d
--- /dev/null
+++ b/lib/views/chat_view/chat_view.dart
@@ -0,0 +1,16 @@
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/views/chat_view/chat_view_state.dart';
+
+
+class ChatView extends ConsumerStatefulWidget {
+  final int? streamID;
+
+  const ChatView({
+    super.key,
+     this.streamID,
+  });
+
+  @override
+  ChatViewState createState() => ChatViewState();
+}
diff --git a/lib/views/chat_view/chat_view_state.dart b/lib/views/chat_view/chat_view_state.dart
new file mode 100644
index 00000000..d11eb412
--- /dev/null
+++ b/lib/views/chat_view/chat_view_state.dart
@@ -0,0 +1,232 @@
+import 'dart:async';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/models/chat/chat_state_model.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/chat_view/chat_view.dart';
+import 'package:logger/logger.dart';
+
+
+class ChatViewState extends ConsumerState<ChatView> {
+  late ScrollController _scrollController;
+  Timer? _updateTimer;
+  bool _isCooldownActive = false;
+  bool _isInitialScrollDone = false;
+
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController = ScrollController();
+    _updateTimer = Timer.periodic(const Duration(seconds: 30), (_) {
+      if (mounted) {
+        if (widget.streamID != null) {
+          ref
+              .read(chatViewModelProvider.notifier)
+              .fetchChatMessages(widget.streamID!);
+        }
+      }
+    });
+    if (widget.streamID != null) {
+      Future.microtask(
+        () => ref
+            .read(chatViewModelProvider.notifier)
+            .fetchChatMessages(widget.streamID!),
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    _updateTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final chatState = ref.watch(chatViewModelProvider);
+    bool isIOS = Theme.of(context).platform == TargetPlatform.iOS;
+    if (chatState.isRateLimitReached) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text(
+              'You are sending messages too fast. Please wait a 10 seconds.',
+            ),
+          ),
+        );
+      });
+    } else if (chatState.isCoolDown) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('You are sending messages too fast. Please wait a 60 seconds.'),
+          ),
+        );
+      });
+    }
+    return buildActiveChat(isIOS);
+  }
+
+  Widget buildActiveChat(bool isIOS) {
+    final chatState = ref.watch(chatViewModelProvider);
+    var chatDecoration = getChatDecoration(isIOS);
+    return Container(
+      padding: const EdgeInsets.all(8),
+      decoration: chatDecoration,
+      child: Stack(
+        children: [
+          buildMessagesList(chatState, isIOS),
+          Align(
+            alignment: Alignment.bottomCenter,
+            child: buildMessageInputField(isIOS),
+          ),
+        ],
+      ),
+    );
+  }
+
+
+  BoxDecoration getChatDecoration(bool isIOS) {
+    return BoxDecoration(
+      color: Theme.of(context).appBarTheme.backgroundColor,
+      borderRadius: BorderRadius.circular(13),
+      boxShadow: [
+        BoxShadow(
+          color: Colors.grey.withOpacity(0.3),
+          spreadRadius: 0.5,
+          blurRadius: 4,
+          offset: const Offset(0, 3),
+        ),
+      ],
+    );
+  }
+
+  Widget buildMessagesList(ChatState chatState, bool isIOS) {
+    final currentUserID = ref.watch(userViewModelProvider).user?.id;
+    WidgetsBinding.instance.addPostFrameCallback((_) => _scrollToBottom());
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 60),
+      child: ListView.builder(
+        controller: _scrollController,
+        itemCount: chatState.messages?.length ?? 0,
+        itemBuilder: (context, index) {
+          final message = chatState.messages![index];
+          bool isSentByMe = int.parse(message.userID) == currentUserID;
+          return buildMessageBubble(message.message, isSentByMe, isIOS);
+        },
+      ),
+    );
+  }
+
+  Widget buildMessageBubble(String message, bool isSentByMe, bool isIOS) {
+    var bubbleStyle = getMessageBubbleStyle(isSentByMe, isIOS);
+    return Align(
+      alignment: isSentByMe ? Alignment.centerRight : Alignment.centerLeft,
+      child: Container(
+        margin: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
+        padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
+        decoration: bubbleStyle,
+        child: Text(
+          message,
+          style: TextStyle(
+            color: isSentByMe ? CupertinoColors.white : CupertinoColors.black,
+          ),
+        ),
+      ),
+    );
+  }
+
+  BoxDecoration getMessageBubbleStyle(bool isSentByMe, bool isIOS) {
+    return BoxDecoration(
+      color: isSentByMe ? (isIOS ? CupertinoColors.activeBlue : Colors.blue) : (isIOS ? CupertinoColors.systemGrey6 : Colors.grey[300]),
+      borderRadius: BorderRadius.circular(18),
+    );
+  }
+
+  Widget buildMessageInputField(bool isIOS) {
+    TextEditingController controller = TextEditingController();
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 15.0),
+      child: isIOS ? buildIOSMessageInputField(controller) : buildNonIOSMessageInputField(controller),
+    );
+  }
+
+  Widget buildIOSMessageInputField(TextEditingController controller) {
+    return CupertinoTextField(
+      controller: controller,
+      placeholder: _isCooldownActive ? 'Wait 30 seconds before sending another message' : 'Type a message...',
+      enabled: !_isCooldownActive,
+      suffix: GestureDetector(
+        onTap: () => postMessage(context, ref, controller.text),
+        child: _isCooldownActive
+            ? const Icon(CupertinoIcons.arrow_up_circle_fill, color: CupertinoColors.systemGrey,)
+            : const Icon(CupertinoIcons.arrow_up_circle_fill, color: CupertinoColors.activeBlue,),
+      ),
+      decoration: BoxDecoration(
+        color: CupertinoColors.systemGrey6,
+        borderRadius: BorderRadius.circular(15),
+      ),
+      padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 8),
+    );
+  }
+
+  Widget buildNonIOSMessageInputField(TextEditingController controller) {
+    return TextField(
+      controller: controller,
+      decoration: InputDecoration(
+        hintText: _isCooldownActive ? 'Wait 30 seconds before sending another message' : 'Type a message...',
+        enabled: !_isCooldownActive,
+        suffixIcon: GestureDetector(
+          onTap: () => postMessage(context, ref, controller.text),
+          child: _isCooldownActive
+              ? const CircularProgressIndicator()
+              : const Icon(Icons.send, color: Colors.blue),
+        ),
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(20),
+          borderSide: BorderSide.none,
+        ),
+        filled: true,
+        fillColor: Colors.grey[200],
+      ),
+    );
+  }
+
+  void postMessage(BuildContext context, WidgetRef ref, String message) {
+    if (!_isCooldownActive && message.isNotEmpty && message.trim().isNotEmpty) {
+      final int? streamId = widget.streamID;
+      ref.read(chatViewModelProvider.notifier).postChatMessage(streamId!, message);
+      // Start cooldown
+      Logger().i('Cooldown started');
+      setState(() {
+        _isCooldownActive = true;
+      });
+      Timer(const Duration(seconds: 30), () {
+        if (mounted) {
+          setState(() {
+            _isCooldownActive = false;
+          });
+        }
+      });
+      Logger().i('Cooldown stopped');
+    }
+  }
+
+
+  void _scrollToBottom() {
+    if (!_isInitialScrollDone && mounted && _scrollController.hasClients) {
+      _scrollController.animateTo(
+        _scrollController.position.maxScrollExtent,
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.easeOut,
+      );
+      _isInitialScrollDone = true;
+    }
+  }
+
+
+}
diff --git a/lib/views/chat_view/inactive_view.dart b/lib/views/chat_view/inactive_view.dart
new file mode 100644
index 00000000..7cf7f08d
--- /dev/null
+++ b/lib/views/chat_view/inactive_view.dart
@@ -0,0 +1,94 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/chat_view/suggested_streams_list.dart';
+import 'package:gocast_mobile/views/video_view/video_player.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class InactiveView extends ConsumerStatefulWidget {
+  final int? streamID;
+
+  const InactiveView({
+    super.key,
+    this.streamID,
+  });
+
+  @override
+  InactiveViewState createState() => InactiveViewState();
+}
+
+class InactiveViewState extends ConsumerState<InactiveView> {
+  @override
+  void initState() {
+    super.initState();
+    // Initialize state here if needed
+  }
+
+  @override
+  void dispose() {
+    // Dispose resources if needed
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final chatState = ref.watch(chatViewModelProvider);
+    var suggestedStreams = ref.watch(videoViewModelProvider).streams ?? [];
+    suggestedStreams = suggestedStreams
+        .where((element) => element.id != widget.streamID)
+        .toList();
+    suggestedStreams
+        .sort((a, b) => a.start.toDateTime().compareTo(b.start.toDateTime()));
+    bool isIOS = Theme.of(context).platform == TargetPlatform.iOS;
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 20.0),
+          decoration: BoxDecoration(
+            color: isIOS
+                ? CupertinoColors.systemBackground.withOpacity(0.9)
+                : Colors.white.withOpacity(0.9),
+            borderRadius: BorderRadius.circular(12),
+            boxShadow: const [
+              BoxShadow(
+                color: Colors.black26,
+                blurRadius: 4,
+                offset: Offset(0, 2),
+              ),
+            ],
+          ),
+          child: Text(
+            chatState.accessDenied
+                ? AppLocalizations.of(context)!.chat_is_disabled_for_this_lecture
+                : AppLocalizations.of(context)!.chat_is_hidden,
+            textAlign: TextAlign.center,
+            style: const TextStyle(
+              color: Colors.black,
+              fontWeight: FontWeight.bold,
+              fontSize: 18,
+            ),
+          ),
+        ),
+        const SizedBox(height: 20),
+        Expanded(
+          child: SuggestedStreamsWidget(
+            suggestedStreams: suggestedStreams,
+            onStreamSelected: (Stream stream) {
+              Navigator.pushReplacement(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => VideoPlayerPage(stream: stream),
+                ),
+              );
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/views/chat_view/poll_view.dart b/lib/views/chat_view/poll_view.dart
new file mode 100644
index 00000000..e089b224
--- /dev/null
+++ b/lib/views/chat_view/poll_view.dart
@@ -0,0 +1,15 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'package:gocast_mobile/views/chat_view/poll_view_state.dart';
+
+class PollView extends ConsumerStatefulWidget {
+  final int? streamID;
+
+  const PollView({
+    super.key,
+    this.streamID,
+  });
+
+  @override
+  PollViewState createState() => PollViewState();
+}
diff --git a/lib/views/chat_view/poll_view_state.dart b/lib/views/chat_view/poll_view_state.dart
new file mode 100644
index 00000000..c71b7e4c
--- /dev/null
+++ b/lib/views/chat_view/poll_view_state.dart
@@ -0,0 +1,283 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/chat_view/poll_view.dart';
+
+
+class PollViewState extends ConsumerState<PollView> {
+  Timer? _updateTimer;
+  Map<int, int> selectedOptions = {};
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeTimer();
+  }
+
+  @override
+  void dispose() {
+    _updateTimer?.cancel();
+    super.dispose();
+  }
+
+  void _initializeTimer() {
+    _updateTimer = Timer.periodic(const Duration(seconds: 60), (_) {
+      if (mounted && widget.streamID != null) {
+        ref.read(pollViewModelProvider.notifier).fetchPolls(widget.streamID!);
+      }
+    });
+
+    if (widget.streamID != null) {
+      Future.microtask(() async {
+        // Fetch the polls first
+        await ref
+            .read(pollViewModelProvider.notifier)
+            .fetchPolls(widget.streamID!);
+        ref.read(pollViewModelProvider.notifier).getAnsweredPolls();
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final polls = ref
+            .watch(pollViewModelProvider)
+            .polls
+            ?.where((poll) => poll.active)
+            .toList() ??
+        [];
+    final answeredPolls = ref.watch(pollViewModelProvider).answeredPolls;
+
+    return Scaffold(
+      body: _buildPollsList(polls, answeredPolls),
+    );
+  }
+
+  Widget _buildPollsList(List<Poll> polls, Map<int, int> answeredPolls) {
+    return polls.isEmpty
+        ? const Center(child: Text('No active polls'))
+        : ListView.builder(
+            itemCount: polls.length,
+            itemBuilder: (context, index) =>
+                _buildPollCard(context, polls[index], answeredPolls),
+          );
+  }
+
+  Widget _buildPollCard(
+      BuildContext context, Poll poll, Map<int, int> answeredPolls,) {
+    bool isAnswered = answeredPolls.containsKey(poll.id);
+    return isAnswered
+        ? _buildAnsweredPollCard(context, poll, answeredPolls[poll.id])
+        : _buildUnansweredPollCard(context, poll);
+  }
+
+  Widget _buildAnsweredPollCard(
+      BuildContext context, Poll poll, int? answeredOptionId,) {
+    ThemeData themeData = Theme.of(context);
+    return Opacity(
+      opacity: 0.5,
+      child: Card(
+        elevation: 1,
+        shadowColor: themeData.shadowColor,
+        color: themeData.cardTheme.color,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          side: BorderSide(
+            color: themeData
+                    .inputDecorationTheme.enabledBorder?.borderSide.color
+                    .withOpacity(0.2) ??
+                Colors.grey.withOpacity(0.2),
+            width: 1.0,
+          ),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8.0),
+          child: Container(
+            color: themeData.cardColor,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                _buildPollQuestion(poll),
+                GridView.builder(
+                  shrinkWrap: true,
+                  physics: const NeverScrollableScrollPhysics(),
+                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: 2,
+                    childAspectRatio:
+                        3,
+                  ),
+                  itemCount: poll.pollOptions.length,
+                  itemBuilder: (context, index) {
+                    return _buildInactivePollOption(context, poll,
+                        poll.pollOptions[index], answeredOptionId,);
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInactivePollOption(BuildContext context, Poll poll,
+      PollOption option, int? selectedOptionId,) {
+    bool isSelected = option.id == selectedOptionId;
+    return Container(
+      margin: const EdgeInsets.all(4.0),
+      decoration: BoxDecoration(
+        color: isSelected ? Colors.grey : Colors.white,
+        borderRadius: BorderRadius.circular(8.0),
+        border:
+            Border.all(color: Colors.grey),
+      ),
+      child: Center(
+        child: Text(
+          option.answer,
+          style: const TextStyle(
+            color:
+                Colors.black,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildUnansweredPollCard(BuildContext context, Poll poll) {
+    ThemeData themeData = Theme.of(context);
+    return Card(
+      elevation: 1,
+      shadowColor: themeData.shadowColor,
+      color: themeData.cardTheme.color,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(8.0),
+        side: BorderSide(
+          color: themeData.inputDecorationTheme.enabledBorder?.borderSide.color
+                  .withOpacity(0.2) ??
+              Colors.grey.withOpacity(0.2),
+          width: 1.0,
+        ),
+      ),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(8.0),
+        child: Container(
+          color: themeData.cardColor,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              _buildPollQuestion(poll),
+              GridView.builder(
+                shrinkWrap: true,
+                physics: const NeverScrollableScrollPhysics(),
+                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                  crossAxisCount: 2,
+                  childAspectRatio:
+                      3,
+                ),
+                itemCount: poll.pollOptions.length,
+                itemBuilder: (context, index) {
+                  return _buildActivePollOption(
+                      context, poll, poll.pollOptions[index],);
+                },
+              ),
+              _buildSubmitButton(poll),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildActivePollOption(
+      BuildContext context, Poll poll, PollOption option,) {
+    bool isSelected = selectedOptions[poll.id] == option.id;
+    return GestureDetector(
+      onTap: () {
+        setState(() {
+          selectedOptions[poll.id] = option.id;
+        });
+      },
+      child: Container(
+        margin: const EdgeInsets.all(4.0), // Add some spacing around each button
+        decoration: BoxDecoration(
+          color: isSelected ? Colors.blue : Colors.white,
+          // Change color based on selection
+          borderRadius: BorderRadius.circular(8.0),
+          border: Border.all(color: isSelected ? Colors.blue : Colors.grey),
+        ),
+        child: Center(
+          child: Text(
+            option.answer,
+            style: TextStyle(
+              color: isSelected
+                  ? Colors.white
+                  : Colors.black, // Change text color based on selection
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPollQuestion(Poll poll) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              poll.question,
+              style: const TextStyle(
+                fontSize: 16.0,
+                fontWeight: FontWeight
+                    .bold,
+              ),
+              textAlign: TextAlign.center,
+              maxLines: 2,
+              overflow: TextOverflow
+                  .ellipsis,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSubmitButton(Poll poll) {
+    final pollViewModel = ref.read(pollViewModelProvider.notifier);
+
+    return Padding(
+      padding: const EdgeInsets.all(8.0), // Consistent padding with the rest of the layout
+      child: ElevatedButton(
+        onPressed: selectedOptions.containsKey(poll.id)
+            ? () {
+          final int? pollOptionId = selectedOptions[poll.id];
+          if (pollOptionId != null) {
+            setState(() {
+              pollViewModel.postPollVote(poll.streamID, pollOptionId);
+              pollViewModel.postAnsweredPoll(poll.id, pollOptionId);
+            });
+          }
+        }
+            : null,
+        style: ElevatedButton.styleFrom(
+          backgroundColor: Theme.of(context).primaryColor,
+          foregroundColor: Colors.white,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(8.0),
+          ),
+          padding: const EdgeInsets.symmetric(vertical: 14.0, horizontal: 30.0),
+          minimumSize: const Size(double.infinity, 48),
+          elevation: 2,
+        ),
+        child: const Text(
+          'Submit',
+          style: TextStyle(fontSize: 16),
+        ),
+      ),
+    );
+  }
+
+}
diff --git a/lib/views/chat_view/suggested_streams_list.dart b/lib/views/chat_view/suggested_streams_list.dart
new file mode 100644
index 00000000..4f4891a3
--- /dev/null
+++ b/lib/views/chat_view/suggested_streams_list.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:intl/intl.dart';
+
+class SuggestedStreamsWidget extends StatelessWidget {
+  final List<Stream> suggestedStreams;
+  final Function(Stream) onStreamSelected;
+
+  const SuggestedStreamsWidget({
+    super.key,
+    required this.suggestedStreams,
+    required this.onStreamSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return suggestedStreams.isNotEmpty
+        ? ListView.builder(
+            itemCount: suggestedStreams.length,
+            itemBuilder: (context, index) {
+              final stream = suggestedStreams[index];
+              return ListTile(
+                leading: const Icon(Icons.play_circle_outline),
+                title: Text(stream.name),
+                subtitle: Text(
+                  DateFormat('dd MMMM yyyy').format(stream.start.toDateTime()),
+                ),
+                onTap: () => onStreamSelected(stream),
+              );
+            },
+          )
+        : const Center(child: Text('No other Lectures available'));
+  }
+}
diff --git a/lib/views/components/base_view.dart b/lib/views/components/base_view.dart
index 98ddf57a..97e160ad 100644
--- a/lib/views/components/base_view.dart
+++ b/lib/views/components/base_view.dart
@@ -1,33 +1,81 @@
-/// Base view for all views
-///
-/// This view is used to wrap all views in the app. It provides a common
-/// scaffold with a navigation bar and a body.
-library;
-
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
 import 'package:gocast_mobile/views/components/custom_bottom_nav_bar.dart';
+import 'package:gocast_mobile/views/settings_view/settings_screen_view.dart';
 
-class BaseView extends StatelessWidget {
+class BaseView extends ConsumerStatefulWidget {
   final Widget child;
-  final String title;
-  final List<Widget>? actions; // Add this line
+  final String? title;
+  final List<Widget>? actions;
+  final bool showLeading;
+  final PreferredSizeWidget? customAppBar;
+  final Widget? bottomNavigationBar;
+  final Widget? settingsHamburgerMenu;
 
   const BaseView({
     super.key,
     required this.child,
-    required this.title,
-    this.actions, // Add this line
+    this.title,
+    this.actions,
+    this.showLeading = false,
+    this.customAppBar,
+    this.bottomNavigationBar = const CustomBottomNavBar(),
+    this.settingsHamburgerMenu = const SettingsScreen(),
   });
 
+  @override
+  BaseViewState createState() => BaseViewState();
+}
+
+class BaseViewState extends ConsumerState<BaseView> {
+  final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
+
+  bool _isTablet(BuildContext context) {
+    return MediaQuery.of(context).size.width >= 600;
+  }
+
+  Widget _buildHamburgerMenu(BuildContext context) {
+    final double drawerWidth = MediaQuery.of(context).size.width * 0.5;
+    return Drawer(
+      width: drawerWidth,
+      child: Padding(
+        padding: const EdgeInsets.only(left: 16.0, right: 16.0, top: 10),
+        child: widget.settingsHamburgerMenu,
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: Text(title),
-        actions: actions, // Use the actions here
-      ),
-      body: child,
-      bottomNavigationBar: const CustomBottomNavBar(),
+      key: scaffoldKey,
+      appBar: widget.customAppBar ??
+          AppBar(
+            automaticallyImplyLeading: widget.showLeading,
+            title: widget.title != null ? Text(widget.title!) : null,
+            actions: _isTablet(context)
+                ? [
+                    IconButton(
+                      icon: const Icon(Icons.settings),
+                      onPressed: () {
+                        scaffoldKey.currentState?.openEndDrawer();
+                      },
+                    ),
+                  ]
+                : widget.actions,
+            surfaceTintColor: Colors.transparent,
+          ),
+      body: widget.child,
+      endDrawer: _isTablet(context) && widget.customAppBar == null
+          ? _buildHamburgerMenu(context)
+          : null,
+      bottomNavigationBar: widget.bottomNavigationBar,
+      onEndDrawerChanged: (isOpen) {
+        if (isOpen) {
+          ref.read(settingViewModelProvider.notifier).loadPreferences();
+        }
+      },
     );
   }
 }
diff --git a/lib/views/components/custom_bottom_nav_bar.dart b/lib/views/components/custom_bottom_nav_bar.dart
index 11e9faab..b3b70486 100644
--- a/lib/views/components/custom_bottom_nav_bar.dart
+++ b/lib/views/components/custom_bottom_nav_bar.dart
@@ -1,14 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/main.dart';
-import 'package:gocast_mobile/views/course_view/downloaded_pinned_courses_view/pinned_courses_view.dart';
-import 'package:gocast_mobile/views/notifications_view/notifications_screen_view.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import '../course_view/courses_overview_view.dart';
-import '../course_view/downloaded_pinned_courses_view/downloaded_courses_view.dart';
-
-// Assuming currentIndexProvider is defined in a global scope file:
-// final currentIndexProvider = StateProvider<int>((ref) => 0);
 
 class CustomBottomNavBar extends ConsumerWidget {
   const CustomBottomNavBar({super.key});
@@ -23,80 +17,70 @@ class CustomBottomNavBar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final currentIndex = ref.watch(currentIndexProvider);
-    final isLoggedIn = ref.read(userViewModel).current.value.user != null;
-
-    void navigateToScreen(int index) {
-      if (currentIndex == index) {
-        return;
-      }
-      ref.read(currentIndexProvider.notifier).state = index; // Update the state
-      switch (index) {
-        case 0:
-          Navigator.of(context).pushAndRemoveUntil(
-            MaterialPageRoute(builder: (context) => const CourseOverview()),
-            (Route<dynamic> route) => false,
-          );
-          break;
-        case 1:
-          Navigator.of(context).pushAndRemoveUntil(
-            MaterialPageRoute(builder: (context) => const DownloadedCourses()),
-            (Route<dynamic> route) => false,
-          );
-          break;
-        case 2:
-          Navigator.of(context).pushAndRemoveUntil(
-            MaterialPageRoute(builder: (context) => const PinnedCourses()),
-            (Route<dynamic> route) => false,
-          );
-          break;
-        case 3:
-          Navigator.of(context).pushAndRemoveUntil(
-            MaterialPageRoute(builder: (context) => NotificationsScreen()),
-            (Route<dynamic> route) => false,
-          );
-          break;
-        default:
-          break;
-      }
-    }
+    final isLoggedIn = ref.read(userViewModelProvider).user != null;
 
     return isLoggedIn
         ? BottomNavigationBar(
             backgroundColor: Theme.of(context).scaffoldBackgroundColor,
             currentIndex: currentIndex,
-            onTap: navigateToScreen,
+            onTap: (index) => _onItemTapped(context, ref, index, currentIndex),
             items: [
-              BottomNavigationBarItem(
-                icon: Icon(
-                  Icons.home,
-                  color: _getColorForIcon(context, 0, currentIndex),
-                ),
-                label: 'Home',
+              _buildNavigationBarItem(
+                Icons.home,
+                AppLocalizations.of(context)!.home,
+                context,
+                currentIndex,
+                0,
               ),
-              BottomNavigationBarItem(
-                icon: Icon(
-                  Icons.download,
-                  color: _getColorForIcon(context, 1, currentIndex),
-                ),
-                label: 'Downloads',
+              _buildNavigationBarItem(
+                Icons.download,
+                AppLocalizations.of(context)!.downloads,
+                context,
+                currentIndex,
+                1,
               ),
-              BottomNavigationBarItem(
-                icon: Icon(
-                  Icons.push_pin,
-                  color: _getColorForIcon(context, 2, currentIndex),
-                ),
-                label: 'Pinned',
+              _buildNavigationBarItem(
+                Icons.push_pin,
+                AppLocalizations.of(context)!.pinned,
+                context,
+                currentIndex,
+                2,
               ),
-              BottomNavigationBarItem(
-                icon: Icon(
-                  Icons.notifications,
-                  color: _getColorForIcon(context, 3, currentIndex),
-                ),
-                label: 'Notifications',
+              _buildNavigationBarItem(
+                Icons.notifications,
+                AppLocalizations.of(context)!.notifications,
+                context,
+                currentIndex,
+                3,
               ),
             ],
             type: BottomNavigationBarType.fixed,
           )
-        : Container(height: 0);
+        : const SizedBox.shrink();
+  }
+
+  void _onItemTapped(
+    BuildContext context,
+    WidgetRef ref,
+    int index,
+    int currentIndex,
+  ) {
+    ref.read(currentIndexProvider.notifier).state = index;
+  }
+
+  BottomNavigationBarItem _buildNavigationBarItem(
+    IconData icon,
+    String label,
+    BuildContext context,
+    int currentIndex,
+    int itemIndex,
+  ) {
+    return BottomNavigationBarItem(
+      icon: Icon(
+        icon,
+        color: _getColorForIcon(context, itemIndex, currentIndex),
+      ),
+      label: label,
+    );
   }
 }
diff --git a/lib/views/components/custom_search_filter_top_nav_bar.dart b/lib/views/components/custom_search_filter_top_nav_bar.dart
new file mode 100644
index 00000000..78cbf464
--- /dev/null
+++ b/lib/views/components/custom_search_filter_top_nav_bar.dart
@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class CustomSearchFilterTopNavBar extends StatelessWidget
+    implements PreferredSizeWidget {
+  final TextEditingController searchController;
+  final VoidCallback? onBackButtonPressed;
+  final VoidCallback? onFilterButtonPressed;
+
+  const CustomSearchFilterTopNavBar({
+    super.key,
+    required this.searchController,
+    this.onBackButtonPressed,
+    this.onFilterButtonPressed,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AppBar(
+      leading: IconButton(
+        icon: const Icon(Icons.arrow_back_ios),
+        onPressed: onBackButtonPressed ??
+            () {
+              // TODO: Define back button functionality
+            },
+      ),
+      title: Container(
+        height: 40,
+        margin: const EdgeInsets.only(right: 8, left: 8),
+        decoration: BoxDecoration(
+          color: const Color(0xEDFAFAFA),
+          borderRadius: BorderRadius.circular(10),
+        ),
+        child: TextField(
+          controller: searchController,
+          decoration: InputDecoration(
+            border: InputBorder.none,
+            hintText: AppLocalizations.of(context)!.search,
+            prefixIcon: const Icon(Icons.search, color: Color(0x993C3C43)),
+            hintStyle: const TextStyle(
+              color: Color(0x993C3C43),
+              fontSize: 17,
+              fontFamily: 'SF Pro Text',
+              fontWeight: FontWeight.w400,
+              letterSpacing: -0.41,
+            ),
+          ),
+        ),
+      ),
+      actions: [
+        IconButton(
+          icon: const Icon(Icons.filter_list_rounded),
+          onPressed: onFilterButtonPressed ??
+              () {
+                // TODO: Define filter button functionality
+              },
+        ),
+      ],
+      titleSpacing: 0.0,
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+}
diff --git a/lib/views/components/custom_search_top_nav_bar.dart b/lib/views/components/custom_search_top_nav_bar.dart
new file mode 100644
index 00000000..4411a5b5
--- /dev/null
+++ b/lib/views/components/custom_search_top_nav_bar.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/views/components/filter_popup_menu_button.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class CustomSearchTopNavBar extends ConsumerWidget
+    implements PreferredSizeWidget {
+  final TextEditingController searchController;
+  final String title;
+
+  final List<String> filterOptions;
+  final Function(String) onClick;
+
+  const CustomSearchTopNavBar({
+    super.key,
+    required this.searchController,
+    required this.title,
+    required this.filterOptions,
+    required this.onClick,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isSearchActive = ref.watch(isSearchActiveProvider);
+
+    return SafeArea(
+      child: AppBar(
+        automaticallyImplyLeading: false,
+        backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
+        elevation: 0,
+        leading: isSearchActive
+            ? IconButton(
+                icon: Icon(
+                  Icons.arrow_back_ios,
+                  color: Theme.of(context).iconTheme.color,
+                ),
+                onPressed: () {
+                  // Clear the search field
+                  searchController.clear();
+                  // Set isSearchActive to false
+                  ref.read(isSearchActiveProvider.notifier).state = false;
+                },
+              )
+            : null,
+        title: AnimatedSwitcher(
+          duration: const Duration(milliseconds: 300),
+          child: isSearchActive
+              ? _buildSearchField(context)
+              : Align(
+                  alignment: Alignment.centerLeft,
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 16.0),
+                    // Adjust left padding here
+                    child: Text(
+                      title,
+                    ),
+                  ),
+                ),
+        ),
+        actions: isSearchActive
+            ? null
+            : [
+                IconButton(
+                  icon: Icon(
+                    Icons.search,
+                    color: Theme.of(context).iconTheme.color,
+                  ),
+                  onPressed: () =>
+                      ref.read(isSearchActiveProvider.notifier).state = true,
+                ),
+                FilterPopupMenuButton(
+                  filterOptions: filterOptions,
+                  onClick: onClick,
+                ),
+              ],
+        titleSpacing: 0.0,
+      ),
+    );
+  }
+
+  Widget _buildSearchField(BuildContext context) {
+    return Container(
+      width: 301,
+      height: 36,
+      decoration: BoxDecoration(
+        color: Theme.of(context).appBarTheme.backgroundColor,
+        borderRadius: BorderRadius.circular(15),
+        boxShadow: [
+          BoxShadow(
+            color:
+                Theme.of(context).appBarTheme.backgroundColor!.withOpacity(0.1),
+            blurRadius: 4,
+            offset: const Offset(0, 2),
+          ),
+        ],
+      ),
+      child: TextField(
+        controller: searchController,
+        onChanged: (value) {},
+        decoration: InputDecoration(
+          border: InputBorder.none,
+          hintText: AppLocalizations.of(context)!.search,
+          prefixIcon: Icon(
+            Icons.search,
+            color: Theme.of(context).inputDecorationTheme.hintStyle?.color,
+          ),
+          hintStyle: Theme.of(context).inputDecorationTheme.hintStyle,
+          contentPadding: const EdgeInsets.symmetric(vertical: 5),
+          hintMaxLines: 1,
+          alignLabelWithHint: true,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(50);
+}
+
+final isSearchActiveProvider = StateProvider<bool>((ref) => false);
diff --git a/lib/views/components/custom_search_top_nav_bar_back_button.dart b/lib/views/components/custom_search_top_nav_bar_back_button.dart
new file mode 100644
index 00000000..097603bf
--- /dev/null
+++ b/lib/views/components/custom_search_top_nav_bar_back_button.dart
@@ -0,0 +1,82 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/views/components/filter_popup_menu_button.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class CustomSearchTopNavBarWithBackButton extends ConsumerWidget
+    implements PreferredSizeWidget {
+  final TextEditingController searchController;
+  final List<String> filterOptions;
+  final Function(String) onClick;
+
+  const CustomSearchTopNavBarWithBackButton({
+    super.key,
+    required this.searchController,
+    required this.filterOptions,
+    required this.onClick,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return SafeArea(
+      child: AppBar(
+        automaticallyImplyLeading: false,
+        backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
+        elevation: 0,
+        leading: IconButton(
+          icon: Icon(
+            Icons.arrow_back_ios,
+            color: Theme.of(context).iconTheme.color,
+          ),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+        title: _buildSearchField(context),
+        actions: [
+          FilterPopupMenuButton(
+            filterOptions: filterOptions,
+            onClick: onClick,
+          ),
+        ],
+        titleSpacing: 0.0,
+      ),
+    );
+  }
+
+  Widget _buildSearchField(BuildContext context) {
+    return Container(
+      width: 301,
+      height: 36,
+      decoration: BoxDecoration(
+        color: Theme.of(context).appBarTheme.backgroundColor,
+        borderRadius: BorderRadius.circular(15),
+        boxShadow: [
+          BoxShadow(
+            color:
+                Theme.of(context).appBarTheme.backgroundColor!.withOpacity(0.1),
+            blurRadius: 4,
+            offset: const Offset(0, 2),
+          ),
+        ],
+      ),
+      child: TextField(
+        controller: searchController,
+        decoration: InputDecoration(
+          border: InputBorder.none,
+          hintText: AppLocalizations.of(context)!.search,
+          prefixIcon: Icon(
+            Icons.search,
+            color: Theme.of(context).inputDecorationTheme.hintStyle?.color,
+          ),
+          hintStyle: Theme.of(context).inputDecorationTheme.hintStyle,
+          contentPadding: const EdgeInsets.symmetric(vertical: 5),
+          hintMaxLines: 1,
+          alignLabelWithHint: true,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(50);
+}
diff --git a/lib/views/components/filter_popup_menu_button.dart b/lib/views/components/filter_popup_menu_button.dart
new file mode 100644
index 00000000..7e22ce19
--- /dev/null
+++ b/lib/views/components/filter_popup_menu_button.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart'; // Assuming this contains your providers
+
+class FilterPopupMenuButton extends ConsumerWidget {
+  final List<String> filterOptions;
+  final Function(String) onClick;
+
+  const FilterPopupMenuButton({
+    super.key,
+    required this.onClick,
+    required this.filterOptions,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    // Assuming both selectedSemester and pinnedSelectedSemester are always the same,
+    // we can just use one of them for the check mark logic.
+    final selectedSemester = ref.read(userViewModelProvider).selectedSemester;
+    final selectedSortedOption = ref.read(videoViewModelProvider).selectedFilterOption;
+
+    return PopupMenuButton<String>(
+      onSelected: (choice) {
+        // When an item is selected, update both providers to ensure they stay in sync
+        ref.read(userViewModelProvider.notifier).setSelectedSemester(choice);
+        ref.read(pinnedCourseViewModelProvider.notifier).setSelectedSemester(choice);
+        onClick(choice);
+      },
+      itemBuilder: (BuildContext context) {
+        return filterOptions.map((choice) {
+          // Check if the item is selected
+          bool isSelected = selectedSemester == choice || selectedSortedOption == choice;
+
+          return PopupMenuItem<String>(
+            value: choice,
+            child: ListTile(
+              contentPadding: EdgeInsets.zero,
+              title: Text(choice),
+              trailing: Opacity(
+                opacity: isSelected ? 1.0 : 0.0,
+                child: Icon(Icons.check, color: Theme.of(context).iconTheme.color),
+              ),
+            ),
+          );
+        }).toList();
+      },
+      icon: Icon(Icons.filter_list, color: Theme.of(context).iconTheme.color),
+    );
+  }
+
+
+
+}
diff --git a/lib/views/components/view_all_button.dart b/lib/views/components/view_all_button.dart
new file mode 100644
index 00000000..0533c639
--- /dev/null
+++ b/lib/views/components/view_all_button.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+
+class ViewAllButton extends StatelessWidget {
+  final VoidCallback? onViewAll;
+  final IconData? icon;
+  final String? text;
+
+  const ViewAllButton({
+    super.key,
+    required this.onViewAll,
+    this.icon,
+    this.text,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onViewAll,
+      child: Row(
+        children: [
+          Text(
+            text ?? "",
+            style: TextStyle(
+              color: Colors.grey[600],
+              fontSize: 12.0,
+              decoration: TextDecoration.underline,
+            ),
+          ),
+          const SizedBox(width: 5),
+          Icon(
+            icon ?? Icons.arrow_forward_ios,
+            size: icon == null ? 25 : 15,
+            color: Theme.of(context).iconTheme.color,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/views/components/viewall_button_view.dart b/lib/views/components/viewall_button_view.dart
deleted file mode 100644
index 7fc4d462..00000000
--- a/lib/views/components/viewall_button_view.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ViewAllButton extends StatelessWidget {
-  final VoidCallback? onViewAll;
-
-  const ViewAllButton({
-    super.key,
-    required this.onViewAll,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return OutlinedButton(
-      onPressed: onViewAll,
-      style: OutlinedButton.styleFrom(
-        foregroundColor: Colors.black,
-        side: const BorderSide(color: Colors.black), // Text and icon color
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(10), // Rounded corners
-        ),
-        padding: const EdgeInsets.symmetric(
-          horizontal: 4,
-          vertical: 2,
-        ), // Padding inside the button
-      ),
-      child: const Row(
-        mainAxisSize: MainAxisSize.min, // To minimize the button width
-        children: [
-          Text('View All'),
-          Icon(
-            Icons.arrow_forward_ios,
-            size: 14,
-          ), // Use a smaller icon size for the arrow
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/views/course_view/components/course_card.dart b/lib/views/course_view/components/course_card.dart
new file mode 100644
index 00000000..fb24f71e
--- /dev/null
+++ b/lib/views/course_view/components/course_card.dart
@@ -0,0 +1,253 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class CourseCard extends StatelessWidget {
+  final String title;
+  final String tumID;
+  final VoidCallback onTap;
+  final int courseId;
+
+
+  //for displaying courses
+  final bool? live;
+
+  final Course? course;
+  final Function(Course)? onPinUnpin;
+  final bool? isPinned;
+  final bool isLoggedIn;
+
+  //for displaying livestreams
+  final String? subtitle;
+
+  const CourseCard({
+    super.key,
+    required this.title,
+    this.subtitle,
+    required this.tumID,
+    required this.courseId,
+    required this.onTap,
+    this.live,
+    this.course,
+    this.onPinUnpin,
+    this.isPinned,
+    required this.isLoggedIn,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData themeData = Theme.of(context);
+
+    double cardWidth = MediaQuery.of(context).size.width >= 600
+        ? MediaQuery.of(context).size.width * 0.4
+        : MediaQuery.of(context).size.width * 0.9;
+
+    return InkWell(
+      onTap: onTap,
+      child: Card(
+        elevation: 1,
+        shadowColor: themeData.shadowColor,
+        color: themeData.cardTheme.color,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          side: BorderSide(
+            color: themeData
+                    .inputDecorationTheme.enabledBorder?.borderSide.color
+                    .withOpacity(0.2) ??
+                Colors.grey.withOpacity(0.2),
+            width: 1.0,
+          ),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8.0),
+            child: _buildCourseCard(
+              themeData,
+              cardWidth,
+              context,
+              course!,
+              onPinUnpin!,
+              isPinned!,
+              isLoggedIn,
+                ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildCourseCard(
+    ThemeData themeData,
+    double cardWidth,
+    BuildContext context,
+    Course course,
+    Function(Course) onPinUnpin,
+    bool isPinned,
+      bool isLoggedIn,
+  ) {
+
+    return Slidable(
+      key: ValueKey(course.id),
+      closeOnScroll: true,
+      endActionPane: isLoggedIn ? ActionPane(
+        motion: const DrawerMotion(),
+        dragDismissible: true,
+        children: [
+          if (isPinned)
+            SlidableAction(
+              autoClose: true,
+              onPressed: (_) async {
+                bool confirmUnpin = await _confirmUnpin(context);
+                if (confirmUnpin) onPinUnpin(course);
+              },
+              backgroundColor: Colors.red,
+              foregroundColor: Colors.white,
+              icon: Icons.push_pin_outlined,
+              label: AppLocalizations.of(context)!.unpin ,
+            ),
+          if (!isPinned)
+            SlidableAction(
+              autoClose: true,
+              onPressed: (_) => onPinUnpin(course),
+              backgroundColor: Colors.blue,
+              foregroundColor: Colors.white,
+              icon: Icons.push_pin,
+              label: AppLocalizations.of(context)!.pin,
+            ),
+        ],
+      ) : null,
+      child: IntrinsicHeight(
+        child: Row(
+          children: [
+            _buildCourseColor(),
+            Expanded(
+              child: Container(
+                color: themeData.cardColor,
+                padding: const EdgeInsets.all(8.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        _buildCourseTumID(),
+                        _buildCourseIsLive(context),
+                      ],
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 3.0),
+                      child: _buildCourseTitle(themeData.textTheme),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<bool> _confirmUnpin(BuildContext context) async {
+    return await showDialog<bool>(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              title: Text(AppLocalizations.of(context)!.confirm_unpin_title),
+              content: Text(AppLocalizations.of(context)!.confirm_unpin_message),
+              actions: <Widget>[
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(false),
+                  child: Text(AppLocalizations.of(context)!.cancel),
+                ),
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(true),
+                  child: Text(AppLocalizations.of(context)!.unpin),
+                ),
+              ],
+            );
+          },
+        ) ??
+        false;
+  }
+
+
+
+
+
+  Widget _buildCourseIsLive(BuildContext context) {
+    if (live == null) return const SizedBox();
+    return live!
+        ?  Row(
+            children: [
+              const Icon(
+                Icons.circle,
+                size: 10,
+                color: Colors.red,
+              ),
+              const SizedBox(width: 5),
+              Text(
+                AppLocalizations.of(context)!.live_now,
+                style: const TextStyle(
+                  color: Colors.red,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          )
+        : const SizedBox();
+  }
+
+  Widget _buildCourseColor() {
+    return Container(
+      width: 5,
+      color: _colorPicker(),
+    );
+  }
+
+  Color _colorPicker() {
+    if (tumID.length < 2) return Colors.grey;
+    switch (tumID.substring(0, 2)) {
+      case 'IN':
+        return Colors.blue;
+      case 'MA':
+        return Colors.purple;
+      case 'CH':
+        return Colors.green;
+      case 'PH':
+        return Colors.orange;
+      case 'MW':
+        return Colors.red;
+      case 'EL':
+        return Colors.black87;
+      default:
+        return Colors.grey;
+    }
+  }
+
+  Widget _buildCourseTitle(TextTheme textTheme) {
+    return Text(
+      title,
+      overflow: TextOverflow.ellipsis,
+      maxLines: 2,
+      softWrap: true,
+      style: textTheme.titleMedium?.copyWith(
+            fontSize: 16,
+            fontWeight: FontWeight.w700,
+            height: 1.2,
+          ) ??
+          const TextStyle(),
+    );
+  }
+
+  Widget _buildCourseTumID() {
+    return Text(
+      tumID,
+      overflow: TextOverflow.ellipsis,
+      style: const TextStyle(
+        fontSize: 14,
+        color: Colors.grey,
+        height: 0.9,
+      ),
+    );
+  }
+}
diff --git a/lib/views/course_view/components/course_card_view.dart b/lib/views/course_view/components/course_card_view.dart
deleted file mode 100644
index d38a6482..00000000
--- a/lib/views/course_view/components/course_card_view.dart
+++ /dev/null
@@ -1,77 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// Course card view
-///
-/// A reusable stateless widget to display a course card.
-///
-/// It takes a [title], [subtitle] and [path] to display the course details.
-/// This widget can be reused for various course sections by providing different
-/// titles, subtitles and paths.
-class CourseCard extends StatelessWidget {
-  final String title;
-  final String subtitle;
-  final String path;
-
-  const CourseCard({
-    super.key,
-    required this.title,
-    required this.subtitle,
-    required this.path,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: () {
-        // TODO: Add navigation to the course details screen
-      },
-      child: Card(
-        child: Container(
-          width: MediaQuery.of(context).size.width *
-              0.4, // was 160, now it's 40% of the screen width
-          padding: const EdgeInsets.all(8.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildCourseImage(),
-              _buildCourseTitle(),
-              _buildCourseSubtitle(),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildCourseImage() {
-    return Expanded(
-      child: Image.asset(
-        path, // Replace with the actual path to your course image
-        fit: BoxFit.cover,
-      ),
-    );
-  }
-
-  Widget _buildCourseTitle() {
-    return Text(
-      title,
-      overflow: TextOverflow.ellipsis,
-      style: const TextStyle(
-        fontSize: 18,
-        fontWeight: FontWeight.bold,
-        color: Colors.black,
-      ),
-    );
-  }
-
-  Widget _buildCourseSubtitle() {
-    return Text(
-      subtitle,
-      overflow: TextOverflow.ellipsis,
-      style: const TextStyle(
-        fontSize: 16,
-        color: Colors.grey,
-      ), // Replace with the exact color
-    );
-  }
-}
diff --git a/lib/views/course_view/components/course_overview_section.dart b/lib/views/course_view/components/course_overview_section.dart
deleted file mode 100644
index 6ca934df..00000000
--- a/lib/views/course_view/components/course_overview_section.dart
+++ /dev/null
@@ -1,129 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gocast_mobile/models/course/course_model.dart';
-import 'package:gocast_mobile/views/components/viewall_button_view.dart';
-import 'package:gocast_mobile/views/course_view/components/course_card_view.dart';
-import 'package:gocast_mobile/views/utils/constants.dart';
-
-/// CourseSection
-///
-/// A reusable stateless widget to display a specific course section.
-///
-/// It takes a [sectionTitle] to display the title of the section and
-/// dynamically generates a horizontal list of courses. This widget can be
-/// reused for various course sections by providing different titles and
-/// course lists.
-///
-/// This widget also takes an [onViewAll] action to define the action to be
-/// performed when the user taps on the View All button.
-/// This widget also takes a [courses] list to display the list of courses.
-/// If no courses are provided, it will display a default list of courses.
-/// This widget can be reused for various course sections by providing
-/// different titles, courses and onViewAll actions.
-class CourseSection extends StatelessWidget {
-  final String sectionTitle;
-  final List<CourseModel>? courses;
-  final VoidCallback onViewAll;
-
-  const CourseSection({
-    super.key,
-    required this.sectionTitle,
-    required this.onViewAll,
-    this.courses,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          _buildCourseSection(
-            context: context,
-            title: sectionTitle,
-            onViewAll: onViewAll,
-            courses: courses ?? _defaultCourses(),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCourseSection({
-    required BuildContext context,
-    required String title,
-    required VoidCallback onViewAll,
-    required List<CourseModel> courses,
-  }) {
-    return Padding(
-      padding: const EdgeInsets.all(16.0),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          _buildSectionTitle(title, onViewAll),
-          SizedBox(
-            height: 200,
-            child: ListView.builder(
-              scrollDirection: Axis.horizontal,
-              itemCount: courses.length,
-              itemBuilder: (BuildContext context, int index) {
-                final course = courses[index];
-                return CourseCard(
-                  title: course.title,
-                  subtitle: course.subtitle,
-                  path: course.imagePath,
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Row _buildSectionTitle(String title, VoidCallback onViewAll) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text(
-          title,
-          style: const TextStyle(
-            fontSize: 22,
-            fontWeight: FontWeight.bold,
-            color: Colors.black,
-          ),
-        ),
-        ViewAllButton(onViewAll: onViewAll),
-      ],
-    );
-  }
-
-  List<CourseModel> _defaultCourses() {
-    return [
-      CourseModel(
-        title: 'PSY101',
-        subtitle: 'Introduction to Psychology',
-        imagePath: AppImages.course1,
-      ),
-      CourseModel(
-        title: 'PSY102',
-        subtitle: 'Introduction to Computer Science',
-        imagePath: AppImages.course2,
-      ),
-      CourseModel(
-        title: 'PSY103',
-        subtitle: 'Introduction to Biology',
-        imagePath: AppImages.course1,
-      ),
-      CourseModel(
-        title: 'PSY104',
-        subtitle: 'Introduction to Chemistry',
-        imagePath: AppImages.course2,
-      ),
-      CourseModel(
-        title: 'PSY105',
-        subtitle: 'Introduction to Physics',
-        imagePath: AppImages.course1,
-      ),
-    ];
-  }
-}
diff --git a/lib/views/course_view/components/course_screen.dart b/lib/views/course_view/components/course_screen.dart
deleted file mode 100644
index e0bd0cc3..00000000
--- a/lib/views/course_view/components/course_screen.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gocast_mobile/models/course/course_model.dart';
-import 'package:gocast_mobile/views/components/base_view.dart';
-import 'package:gocast_mobile/views/course_view/components/course_card_view.dart';
-import 'package:gocast_mobile/views/settings_view/settings_screen_view.dart';
-import 'package:gocast_mobile/views/utils/constants.dart';
-
-/// CoursesScreen
-///
-/// This screen displays a list of courses.
-///
-/// It takes a [title] to display the title of the section and
-/// dynamically generates a horizontal list of courses. This widget can be
-/// reused for various course sections by providing different titles and
-/// course lists.
-class CoursesScreen extends StatelessWidget {
-  final String title;
-  final List<CourseModel> courses;
-
-  const CoursesScreen({
-    super.key,
-    required this.title,
-    required this.courses,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return BaseView(
-      title: 'GoCast',
-      actions: _buildAppBarActions(context),
-      child: SingleChildScrollView(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            _buildSectionTitle(),
-            _buildCourseListView(),
-          ],
-        ),
-      ),
-    );
-  }
-
-  List<Widget> _buildAppBarActions(BuildContext context) {
-    return [
-      IconButton(
-        icon: const Icon(Icons.settings),
-        onPressed: () => Navigator.push(
-          context,
-          MaterialPageRoute(builder: (context) => const SettingsScreen()),
-        ),
-      ),
-    ];
-  }
-
-  Padding _buildSectionTitle() {
-    return Padding(
-      padding: AppPadding.sectionPadding,
-      child: Text(
-        title,
-      ),
-    );
-  }
-
-  SizedBox _buildCourseListView() {
-    return SizedBox(
-      height: AppSizes.courseListHeight,
-      child: ListView.builder(
-        scrollDirection: Axis.horizontal,
-        itemCount: courses.length,
-        itemBuilder: (BuildContext context, int index) {
-          final course = courses[index]; // Get the course object
-          return CourseCard(
-            title: course.title,
-            subtitle: course.subtitle,
-            path: course.imagePath,
-          );
-        },
-      ),
-    );
-  }
-}
diff --git a/lib/views/course_view/components/course_section.dart b/lib/views/course_view/components/course_section.dart
new file mode 100644
index 00000000..aa5d35e9
--- /dev/null
+++ b/lib/views/course_view/components/course_section.dart
@@ -0,0 +1,184 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/section_kind.dart';
+import 'package:gocast_mobile/views/components/view_all_button.dart';
+import 'package:gocast_mobile/views/course_view/components/course_card.dart';
+import 'package:gocast_mobile/views/course_view/course_detail_view/course_detail_view.dart';
+import 'dart:math' as math;
+
+
+/// CourseSection
+///
+/// A reusable stateless widget to display a specific course section.
+///
+/// It takes a [sectionTitle] to display the title of the section and
+/// dynamically generates a horizontal list of courses. This widget can be
+/// reused for various course sections by providing different titles and
+/// course lists.
+///
+/// This widget also takes an [onViewAll] action to define the action to be
+/// performed when the user taps on the View All button.
+/// This widget also takes a [courses] list to display the list of courses.
+/// If no courses are provided, it will display a default list of courses.
+/// This widget can be reused for various course sections by providing
+/// different titles, courses and onViewAll actions.
+class CourseSection extends StatelessWidget {
+  final String sectionTitle;
+  final SectionKind
+      sectionKind;
+  final List<Course> courses;
+  final List<Stream> streams;
+  final VoidCallback? onViewAll;
+  final WidgetRef ref;
+  final String baseUrl = 'https://live.rbg.tum.de';
+
+  const CourseSection({
+    super.key,
+    required this.ref,
+    required this.sectionTitle,
+    required this.sectionKind,
+    required this.streams,
+    this.onViewAll,
+    required this.courses,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildCourseSection(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCourseSection(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildCoursesTitle(context),
+          courses.isEmpty
+              ? _buildNoCoursesMessage(
+                  context,
+                ) // If streams are empty, show no courses message
+              : _buildCourseList(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCourseList(BuildContext context) {
+    bool isTablet = MediaQuery.of(context).size.width >= 600 ? true : false;
+    int displayCount = math.min(courses.length, 3);
+    double cardHeight = 75;
+
+    return ConstrainedBox(
+      constraints: BoxConstraints(maxHeight: isTablet ? double.infinity : cardHeight * displayCount,),
+      child: ListView.builder(
+        physics: const ClampingScrollPhysics(),
+        shrinkWrap: true,
+        scrollDirection: Axis.vertical,
+        itemCount: courses.length,
+        itemBuilder: (BuildContext context, int index) {
+          final course = courses[index];
+          final userPinned =
+              ref.watch(pinnedCourseViewModelProvider).userPinned ?? [];
+
+          final isPinned = userPinned.contains(course);
+          return CourseCard(
+            isLoggedIn: ref.read(userViewModelProvider).user != null,
+            course: course,
+            isPinned: isPinned,
+            onPinUnpin: (course) => _togglePin(course, isPinned),
+            title: course.name,
+            tumID: course.tUMOnlineIdentifier,
+            live: streams.any((stream) => stream.courseID == course.id),
+            courseId: course.id,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => CourseDetail(
+                    title: course.name,
+                    courseId: course.id,
+                  ),
+                ),
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+
+  Future<void> _togglePin(Course course, bool isPinned) async {
+    final pinnedViewModel = ref.read(pinnedCourseViewModelProvider.notifier);
+    if (isPinned) {
+      await pinnedViewModel.unpinCourse(course.id);
+    } else {
+      await pinnedViewModel.pinCourse(course.id);
+    }
+    await _refreshPinnedCourses();
+  }
+
+  Future<void> _refreshPinnedCourses() async {
+    await ref.read(pinnedCourseViewModelProvider.notifier).fetchUserPinned();
+  }
+
+  Widget _buildCoursesTitle(BuildContext context) {
+    IconData icon =
+        sectionKind == SectionKind.myCourses ? Icons.school : Icons.public;
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Row(
+          children: [
+            Icon(icon),
+            const SizedBox(width: 10),
+            Text(
+              sectionTitle,
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+          ],
+        ),
+        ViewAllButton(onViewAll: onViewAll),
+      ],
+    );
+  }
+
+  Widget _buildNoCoursesMessage(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox(height: 20),
+          const Center(
+            child: Icon(Icons.not_interested, size: 50, color: Colors.grey),
+          ),
+          const SizedBox(height: 8),
+          Center(
+            child: Text(
+              'No $sectionTitle found',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+                color: Colors.grey,
+              ),
+            ),
+          ),
+          const SizedBox(height: 12),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/views/course_view/components/courselist_screen.dart b/lib/views/course_view/components/courselist_screen.dart
deleted file mode 100644
index ef6679c1..00000000
--- a/lib/views/course_view/components/courselist_screen.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/views/components/base_view.dart';
-import 'package:gocast_mobile/views/video_view/video_card_view.dart';
-
-/// CourseListScreen
-///
-/// This screen displays a list of courses.
-///
-/// It takes a [title] to display the title of the section and
-/// dynamically generates a horizontal list of courses.
-class CourseListScreen extends ConsumerWidget {
-  final String title;
-  final List<VideoCard> videoCards;
-
-  const CourseListScreen({
-    super.key,
-    required this.title,
-    required this.videoCards,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseView(
-      title: title,
-      actions: [
-        IconButton(
-          icon: const Icon(Icons.search),
-          onPressed: () {
-            // Implement search functionality
-          },
-        ),
-        IconButton(
-          icon: const Icon(Icons.filter_list),
-          onPressed: () {
-            // Implement more options functionality
-          },
-        ),
-      ],
-      child: ListView.builder(
-        itemCount: videoCards.length,
-        itemBuilder: (BuildContext context, int index) {
-          return videoCards[index];
-        },
-      ),
-    );
-  }
-}
diff --git a/lib/views/course_view/components/live_stream_section.dart b/lib/views/course_view/components/live_stream_section.dart
new file mode 100644
index 00000000..7195934a
--- /dev/null
+++ b/lib/views/course_view/components/live_stream_section.dart
@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+
+import 'package:gocast_mobile/views/course_view/components/pulse_background.dart';
+import 'package:gocast_mobile/views/course_view/components/small_stream_card.dart';
+import 'package:gocast_mobile/views/video_view/video_player.dart';
+import 'package:tuple/tuple.dart';
+
+/// CourseSection
+///
+/// A reusable stateless widget to display a specific course section.
+///
+/// It takes a [sectionTitle] to display the title of the section and
+/// dynamically generates a horizontal list of courses. This widget can be
+/// reused for various course sections by providing different titles and
+/// course lists.
+///
+/// This widget also takes an [onViewAll] action to define the action to be
+/// performed when the user taps on the View All button.
+/// This widget also takes a [courses] list to display the list of courses.
+/// If no courses are provided, it will display a default list of courses.
+/// This widget can be reused for various course sections by providing
+/// different titles, courses and onViewAll actions.
+class LiveStreamSection extends StatelessWidget {
+  final String sectionTitle;
+  final List<Course> courses;
+  final List<Tuple2<Stream, String>> streams;
+  final VoidCallback? onViewAll;
+  final WidgetRef ref;
+  final String baseUrl = 'https://live.rbg.tum.de';
+
+  const LiveStreamSection({
+    super.key,
+    required this.ref,
+    required this.sectionTitle,
+    required this.streams,
+    this.onViewAll,
+    required this.courses,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildCourseSection(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCourseSection(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const PulsingBackground(),
+          // Use the ternary conditional operator for inline conditions
+          streams.isEmpty
+              ? _buildNoCoursesMessage(
+                  context,
+                ) // If streams are empty, show no courses message
+              : _buildStreamList(context), // Otherwise, show the stream list
+        ],
+      ),
+    );
+  }
+
+  Widget _buildStreamList(BuildContext context) {
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      child: Row(
+        children: streams.map((stream) {
+          String imagePath;
+
+          imagePath = _getThumbnailUrl(stream.item2);
+
+          final course = courses
+              .where((course) => course.id == stream.item1.courseID)
+              .first;
+
+          return SmallStreamCard(
+            title: stream.item1.name,
+            subtitle: course.name,
+            tumID: course.tUMOnlineIdentifier,
+            roomName: stream.item1.roomName,
+            roomNumber: stream.item1.roomCode,
+            path: imagePath,
+            courseId: course.id,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => VideoPlayerPage(
+                    stream: stream.item1,
+                  ),
+                ),
+              );
+            },
+          );
+        }).toList(),
+      ),
+    );
+  }
+
+  Widget _buildNoCoursesMessage(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox(height: 20),
+          const Center(
+            child: Icon(Icons.not_interested, size: 50, color: Colors.grey),
+          ),
+          const SizedBox(height: 8),
+          Center(
+            child: Text(
+              'No $sectionTitle found',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+                color: Colors.grey,
+              ),
+            ),
+          ),
+          const SizedBox(height: 12),
+        ],
+      ),
+    );
+  }
+
+  String _getThumbnailUrl(String thumbnail) {
+    if (!thumbnail.startsWith('http')) {
+      thumbnail = '$baseUrl$thumbnail';
+    }
+    return thumbnail;
+  }
+}
diff --git a/lib/views/course_view/components/pin_button.dart b/lib/views/course_view/components/pin_button.dart
new file mode 100644
index 00000000..0c4ab797
--- /dev/null
+++ b/lib/views/course_view/components/pin_button.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+
+class PinButton extends ConsumerWidget {
+  final int courseId;
+  final bool isInitiallyPinned;
+  final VoidCallback onPinStatusChanged;
+
+  const PinButton({
+    super.key,
+    required this.courseId,
+    required this.isInitiallyPinned,
+    required this.onPinStatusChanged,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    bool isLoggedIn = ref.read(userViewModelProvider).user != null;
+    if (!isLoggedIn) {
+      return const Icon(
+        Icons.push_pin_outlined,
+        color: Colors.transparent,);
+    }
+    return StatefulBuilder(
+      builder: (context, setState) {
+        return IconButton(
+          icon: Icon(
+            isInitiallyPinned ? Icons.push_pin : Icons.push_pin_outlined,
+            color: Theme.of(context).colorScheme.primary,
+          ),
+          onPressed: () async {
+            final pinnedViewModel =
+                ref.read(pinnedCourseViewModelProvider.notifier);
+            if (isInitiallyPinned) {
+              await pinnedViewModel.unpinCourse(courseId);
+            } else {
+              await pinnedViewModel.pinCourse(courseId);
+            }
+            setState(() {}); // Trigger rebuild to update icon
+            onPinStatusChanged();
+          },
+        );
+      },
+    );
+  }
+}
diff --git a/lib/views/course_view/components/pulse_background.dart b/lib/views/course_view/components/pulse_background.dart
new file mode 100644
index 00000000..6cfca0d7
--- /dev/null
+++ b/lib/views/course_view/components/pulse_background.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class PulsingBackground extends StatefulWidget {
+  const PulsingBackground({super.key});
+
+  @override
+  State<PulsingBackground> createState() => _PulsingBackgroundState();
+}
+
+class _PulsingBackgroundState extends State<PulsingBackground>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<Color?> _colorAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 1),
+    )..repeat(reverse: true);
+
+    _colorAnimation =
+        ColorTween(begin: Colors.red.withOpacity(0.6), end: Colors.red).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: Curves.easeInOut,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _animationController,
+      builder: (context, child) {
+        return Container(
+          padding: const EdgeInsets.only(left: 4.0, right: 4.0),
+          decoration: BoxDecoration(
+            color: _colorAnimation.value,
+            borderRadius: BorderRadius.circular(4.0),
+          ),
+          child: Text(
+            AppLocalizations.of(context)!.live_now,
+            style: Theme.of(context)
+                .textTheme
+                .titleMedium
+                ?.copyWith(color: Colors.white, fontSize: 20),
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+}
diff --git a/lib/views/course_view/components/small_stream_card.dart b/lib/views/course_view/components/small_stream_card.dart
new file mode 100644
index 00000000..70c20b0c
--- /dev/null
+++ b/lib/views/course_view/components/small_stream_card.dart
@@ -0,0 +1,268 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_slidable/flutter_slidable.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/utils/constants.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class SmallStreamCard extends StatelessWidget {
+  final String title;
+  final String tumID;
+  final VoidCallback onTap;
+  final int? courseId;
+
+  //for displaying courses
+  final bool? live;
+  final bool? isDownloaded;
+  final Course? course;
+  final Function(int)? showDeleteConfirmationDialog;
+  //for displaying livestreams
+  final String? subtitle;
+  final String? roomName;
+  final String? roomNumber;
+
+  final String? path;
+
+  const SmallStreamCard({
+    super.key,
+    required this.title,
+    this.subtitle,
+    required this.tumID,
+    this.roomName,
+    this.roomNumber,
+    this.path,
+    this.courseId,
+    required this.onTap,
+    this.live,
+    this.course,
+    this.isDownloaded,
+    this.showDeleteConfirmationDialog,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData themeData = Theme.of(context);
+
+    double cardWidth = MediaQuery.of(context).size.width >= 600
+        ? MediaQuery.of(context).size.width * 0.4
+        : MediaQuery.of(context).size.width * 0.9;
+
+    return InkWell(
+      onTap: onTap,
+      child: Card(
+        elevation: 1,
+        shadowColor: themeData.shadowColor,
+        color: themeData.cardTheme.color,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          side: BorderSide(
+            color: themeData
+                    .inputDecorationTheme.enabledBorder?.borderSide.color
+                    .withOpacity(0.2) ??
+                Colors.grey.withOpacity(0.2),
+            width: 1.0,
+          ),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8.0),
+          child: _buildStreamCard(
+            context,
+            themeData,
+            cardWidth,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStreamCard(BuildContext context, ThemeData themeData, double cardWidth) {
+    return (isDownloaded!=null && showDeleteConfirmationDialog!=null) ? _buildDownloadedCard(context, themeData, cardWidth) : _buildLiveCard(themeData, cardWidth);
+  }
+
+  Widget _buildDownloadedCard (BuildContext context, ThemeData themeData, double cardWidth) {
+    return Slidable(
+        key: Key(courseId.toString()),
+        closeOnScroll: true,
+        endActionPane: ActionPane(
+          motion: const DrawerMotion(),
+          dragDismissible: true,
+          children: [
+            SlidableAction(
+              onPressed: (_) => showDeleteConfirmationDialog!(courseId!),
+              autoClose: true,
+              backgroundColor: Colors.red,
+              foregroundColor: Colors.white,
+              icon: Icons.delete_rounded,
+              label: AppLocalizations.of(context)!.delete,
+            ),
+          ],
+        ),
+        child: _buildLiveCard(themeData, cardWidth*1.3),
+    );
+  }
+
+  Widget _buildLiveCard(ThemeData themeData, double cardWidth) {
+    return Container(
+      width: cardWidth,
+      padding: const EdgeInsets.all(8.0),
+      color: themeData.cardColor,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              _buildCourseTumID(),
+            ],
+          ),
+          const SizedBox(height: 2),
+          Row(
+            children: [
+              SizedBox(
+                width: 100,
+                child: _buildCourseImage(),
+              ),
+              const SizedBox(width: 15),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const SizedBox(height: 10),
+                    _buildCourseTitle(themeData.textTheme),
+                    _buildCourseSubtitle(themeData.textTheme),
+                    const SizedBox(height: 15),
+                    _buildLocation(themeData),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCourseImage() {
+    return Stack(
+      children: [
+        AspectRatio(
+          aspectRatio: 16 / 12,
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(8.0),
+            child: path == null
+                ? Image.asset(
+                    AppImages.course1,
+                    fit: BoxFit.cover,
+                  )
+                :
+            Image.network(
+              path!, // Use the image URL
+              fit: BoxFit.cover, // Maintain the cover fit
+              loadingBuilder: (context, child, loadingProgress) {
+                if (loadingProgress == null) {
+                  return child; // Image is fully loaded
+                }
+                return Center(
+                  child: CircularProgressIndicator(
+                    value: loadingProgress.expectedTotalBytes != null
+                        ? loadingProgress.cumulativeBytesLoaded /
+                            (loadingProgress.expectedTotalBytes ?? 1)
+                        : null,
+                  ),
+                );
+              },
+              errorBuilder: (context, error, stackTrace) {
+                return Image.asset(
+                  AppImages.course1,
+                  fit: BoxFit.cover,
+                );
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildLocation(ThemeData themeData) {
+    if (roomNumber == null) return const SizedBox();
+
+    final Uri url = Uri.parse('https://nav.tum.de/room/$roomNumber');
+
+    return Align(
+      alignment: Alignment.centerRight, // Align to the right
+      child: Container(
+        padding: const EdgeInsets.all(8),
+        decoration: BoxDecoration(
+          border: Border.all(
+            color: themeData
+                    .inputDecorationTheme.enabledBorder?.borderSide.color
+                    .withOpacity(0.4) ??
+                Colors.grey.withOpacity(0.4),
+          ),
+          borderRadius: BorderRadius.circular(5),
+        ),
+        child: InkWell(
+          onTap: () async {
+            if (await canLaunchUrl(url)) {
+              await launchUrl(url);
+            } else {
+              throw 'Could not launch $url';
+            }
+          },
+          child: const Row(
+            mainAxisSize: MainAxisSize.min,
+            // Constrain row size to its children
+            children: [
+              Icon(Icons.room, size: 24),
+              SizedBox(width: 8), // Spacing before the arrow icon
+              Icon(Icons.arrow_forward_ios, size: 16),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildCourseTumID() {
+    return Text(
+      tumID,
+      overflow: TextOverflow.ellipsis,
+      style: const TextStyle(
+        fontSize: 14,
+        color: Colors.grey,
+        height: 0.9,
+      ),
+    );
+  }
+
+  Widget _buildCourseTitle(TextTheme textTheme) {
+    return Text(
+      title,
+      overflow: TextOverflow.ellipsis,
+      maxLines: 2,
+      softWrap: true,
+      style: textTheme.titleMedium?.copyWith(
+            fontSize: 16,
+            fontWeight: FontWeight.w700,
+            height: 1.2,
+          ) ??
+          const TextStyle(),
+    );
+  }
+
+  Widget _buildCourseSubtitle(TextTheme textTheme) {
+    if (subtitle == null) return const SizedBox();
+
+    return Text(
+      subtitle!, //nullcheck already passed
+      overflow: TextOverflow.ellipsis,
+      style: textTheme.labelSmall?.copyWith(
+            fontSize: 14,
+            fontWeight: FontWeight.w400,
+            height: 1,
+          ) ??
+          const TextStyle(),
+    );
+  }
+}
diff --git a/lib/views/course_view/components/stream_card.dart b/lib/views/course_view/components/stream_card.dart
new file mode 100644
index 00000000..21868822
--- /dev/null
+++ b/lib/views/course_view/components/stream_card.dart
@@ -0,0 +1,218 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/constants.dart';
+import 'package:gocast_mobile/views/video_view/video_player.dart';
+import 'package:intl/intl.dart';
+
+class StreamCard extends ConsumerStatefulWidget {
+  final Stream stream;
+  final String imageName;
+  final VoidCallback onTap;
+
+  const StreamCard({
+    super.key,
+    required this.stream,
+    required this.imageName,
+    required this.onTap,
+  });
+
+  @override
+  StreamCardState createState() => StreamCardState();
+}
+
+class StreamCardState extends ConsumerState<StreamCard> {
+  String imageName =
+      'https://live.rbg.tum.de/thumb-fallback.png'; // Replace with your image URL
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData themeData = Theme.of(context);
+    final progressAsyncValue = ref.watch(progressProvider(widget.stream.id));
+    onTap() async {
+      await Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) => VideoPlayerPage(
+            stream: widget.stream,
+          ),
+        ),
+      );
+      var _ = ref.refresh(progressProvider(widget.stream.id));
+    }
+
+    return InkWell(
+      onTap: onTap,
+      child: Card(
+        elevation: 1,
+        shadowColor: themeData.shadowColor,
+        color: themeData.cardTheme.color,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.0),
+          side: BorderSide(
+            color: themeData
+                    .inputDecorationTheme.enabledBorder?.borderSide.color
+                    .withOpacity(0.2) ??
+                Colors.grey.withOpacity(0.2),
+            width: 1.0,
+          ),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8.0),
+          child: Container(
+            color: themeData.cardColor,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                _buildHeader(
+                  title: widget.stream.name,
+                  subtitle: widget.stream.description,
+                  length: widget.stream.duration,
+                  themeData: themeData,
+                ),
+                _buildThumbnail(themeData),
+                progressAsyncValue.when(
+                  loading: () => const LinearProgressIndicator(),
+                  error: (e, st) => Text('Error: $e'),
+                  data: (progress) => LinearProgressIndicator(
+                    value: progress.progress,
+                    minHeight: 10.0,
+                    backgroundColor: Colors.grey[300],
+                    valueColor:
+                        const AlwaysStoppedAnimation<Color>(Colors.blue),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildThumbnail(ThemeData themeData) {
+    return Stack(
+      children: [
+        AspectRatio(
+          aspectRatio: 16 / 9,
+          child: Image.network(
+            imageName,
+            fit: BoxFit.cover,
+            loadingBuilder: (context, child, loadingProgress) {
+              if (loadingProgress == null) {
+                return child;
+              } else {
+                return Center(
+                  child: CircularProgressIndicator(
+                    value: loadingProgress.expectedTotalBytes != null
+                        ? loadingProgress.cumulativeBytesLoaded /
+                            (loadingProgress.expectedTotalBytes ?? 1)
+                        : null,
+                  ),
+                );
+              }
+            },
+            errorBuilder: (context, error, stackTrace) {
+              return Image.asset(
+                AppImages.course1,
+                fit: BoxFit.cover,
+              );
+            },
+          ),
+        ),
+        Positioned(
+          bottom: 4,
+          right: 4,
+          child: _buildStreamLength(themeData),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildHeader({
+    required String title,
+    required String subtitle,
+    int? length,
+    Widget? trailing,
+    required ThemeData themeData,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  title,
+                  style: const TextStyle(
+                    fontSize: 16.0,
+                    fontWeight: FontWeight.bold,
+                  ),
+                  maxLines: 2,
+                ),
+              ],
+            ),
+          ),
+          if (length != null) _buildStreamDate(themeData),
+          if (trailing != null) trailing,
+        ],
+      ),
+    );
+  }
+
+  String formatDuration(int durationInMinutes) {
+    int hours = durationInMinutes ~/ 60;
+    int minutes = durationInMinutes % 60;
+    int seconds = 0;
+
+    String formattedHours = hours < 10 ? '0$hours' : '$hours';
+    String formattedMinutes = minutes < 10 ? '0$minutes' : '$minutes';
+    String formattedSeconds = seconds < 10 ? '0$seconds' : '$seconds';
+
+    return '$formattedHours:$formattedMinutes:$formattedSeconds';
+  }
+
+  Widget _buildStreamDate(ThemeData themeData) {
+    return Container(
+      decoration: BoxDecoration(
+        color: themeData.focusColor,
+        borderRadius: BorderRadius.circular(4),
+      ),
+      padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 2),
+      child: Text(
+        DateFormat('EEEE, MM/dd/yyyy, HH:mm')
+            .format(widget.stream.start.toDateTime()),
+        style: const TextStyle(
+          fontSize: 12,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStreamLength(ThemeData themeData) {
+    return Container(
+      decoration: BoxDecoration(
+        color: themeData.shadowColor.withOpacity(0.8),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      padding: const EdgeInsets.all(5),
+      child: Text(
+        formatDuration(widget.stream.duration),
+        style: themeData.textTheme.labelSmall?.copyWith(
+          fontSize: 12,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/course_view/course_detail_view/course_detail_view.dart b/lib/views/course_view/course_detail_view/course_detail_view.dart
new file mode 100644
index 00000000..a9e8078b
--- /dev/null
+++ b/lib/views/course_view/course_detail_view/course_detail_view.dart
@@ -0,0 +1,263 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar_back_button.dart';
+import 'package:gocast_mobile/views/course_view/components/pin_button.dart';
+import 'package:gocast_mobile/views/course_view/components/stream_card.dart';
+import 'package:gocast_mobile/views/video_view/video_player.dart';
+
+import 'package:tuple/tuple.dart';
+
+class CourseDetail extends ConsumerStatefulWidget {
+  final String title;
+  final int courseId;
+  final String? courseTumId;
+
+  const CourseDetail({
+    super.key,
+    required this.title,
+    required this.courseId,
+    this.courseTumId,
+  });
+
+  @override
+  CourseDetailState createState() => CourseDetailState();
+}
+
+class CourseDetailState extends ConsumerState<CourseDetail> {
+  late List<Tuple2<Stream, String>> temp;
+  final TextEditingController searchController = TextEditingController();
+  final String baseUrl = 'https://live.rbg.tum.de';
+  bool isSearchInitialized = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeStreams();
+    searchController.addListener(_searchCourses);
+  }
+
+  // set the thumbnails streams and search results
+  void _initializeStreams() {
+    final videoViewModelNotifier = ref.read(videoViewModelProvider.notifier);
+    Future.microtask(() async {
+      await videoViewModelNotifier.fetchCourseStreams(widget.courseId);
+      await videoViewModelNotifier.fetchThumbnails();
+    });
+  }
+
+  void _handleSortOptionSelected(String choice) {
+    var allStreams = ref.watch(videoViewModelProvider).streamsWithThumb ?? [];
+    ref
+        .read(videoViewModelProvider.notifier)
+        .updateSelectedFilterOption(choice, allStreams);
+  }
+
+  void _searchCourses() {
+    final videoViewModelNotifier = ref.read(videoViewModelProvider.notifier);
+    var displayedStreams =
+        ref.watch(videoViewModelProvider).displayedStreams ?? [];
+    final searchInput = searchController.text.toLowerCase();
+    if (!isSearchInitialized) {
+      temp = List.from(displayedStreams);
+      isSearchInitialized = true;
+    }
+
+    setState(() {
+      if (searchInput.isEmpty) {
+        videoViewModelNotifier.updatedDisplayedStreams(temp);
+        isSearchInitialized = false;
+      } else {
+        displayedStreams = displayedStreams.where((stream) {
+          return stream.item1.name.toLowerCase().contains(searchInput) ||
+              stream.item1.description.toLowerCase().contains(searchInput);
+        }).toList();
+        videoViewModelNotifier.updatedDisplayedStreams(displayedStreams);
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final scaffoldMessenger = ScaffoldMessenger.of(context);
+    final streams = ref.watch(videoViewModelProvider).displayedStreams ?? [];
+    return Scaffold(
+      appBar: CustomSearchTopNavBarWithBackButton(
+        searchController: searchController,
+        onClick: _handleSortOptionSelected,
+        filterOptions: [AppLocalizations.of(context)!.newest_first, AppLocalizations.of(context)!.oldest_first],
+      ),
+      body: RefreshIndicator(
+        onRefresh: () => _refreshStreams(widget.courseId),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _courseTitle(widget.title),
+            _buildStreamList(
+              context,
+              streams,
+              scaffoldMessenger,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// Fetches user pinned information.
+
+  Future<void> _refreshStreams(int courseID) async {
+    await ref
+        .read(videoViewModelProvider.notifier)
+        .fetchCourseStreams(courseID);
+    await ref.read(videoViewModelProvider.notifier).fetchThumbnails();
+  }
+
+  // In _courseTitle method of CourseDetailState
+  Widget _courseTitle(String title) {
+    bool isPinned = _checkPinStatus();
+
+    return Padding(
+      padding: const EdgeInsets.only(left: 16.0, right: 16.0, top: 16.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Expanded(
+            child: Text(
+              title,
+              style:
+                  const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+          PinButton(
+            courseId: widget.courseId,
+            isInitiallyPinned: isPinned,
+            onPinStatusChanged: () => setState(() {}),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Builds the list of streams.
+  Widget _buildStreamList(
+    BuildContext context,
+    List<Tuple2<Stream, String>> streamsWithThumb,
+    ScaffoldMessengerState scaffoldMessenger,
+  ) {
+    double width = MediaQuery.of(context).size.width;
+    bool isTablet = width >= 600 ? true : false;
+    return Expanded(
+      child: streamsWithThumb.isNotEmpty
+          ? Padding(
+              padding:
+                  EdgeInsets.symmetric(horizontal: isTablet ? width * 0.15 : 0),
+              child: ListView.builder(
+                itemCount: streamsWithThumb.length,
+                padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                itemBuilder: (context, index) => _streamCardBuilder(
+                  context,
+                  index,
+                  streamsWithThumb,
+                  scaffoldMessenger,
+                ),
+              ),
+            )
+          :  Center(child: Text(AppLocalizations.of(context)!.no_courses_found)),
+    );
+  }
+
+  /// Builds individual stream cards.
+  Widget _streamCardBuilder(
+    BuildContext context,
+    int index,
+    List<Tuple2<Stream, String>> streamsWithThumb,
+    ScaffoldMessengerState scaffoldMessenger,
+  ) {
+    final streamWithThumb = streamsWithThumb[index];
+    final stream = streamWithThumb.item1;
+    final thumbnail = _getThumbnailUrl(streamWithThumb.item2);
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: StreamCard(
+        imageName: thumbnail,
+        stream: stream,
+        onTap: () => _handleStreamTap(context, scaffoldMessenger, stream),
+      ),
+    );
+  }
+
+  String _getThumbnailUrl(String thumbnail) {
+    if (!thumbnail.startsWith('http')) {
+      thumbnail = '$baseUrl$thumbnail';
+    }
+    return thumbnail;
+  }
+
+  /// Handles taps on stream cards.
+  Future<void> _handleStreamTap(
+    BuildContext context,
+    ScaffoldMessengerState scaffoldMessenger,
+    Stream stream,
+  ) async {
+    try {
+      await _navigateToVideoPlayer(ref, context, stream);
+    } catch (e) {
+      _showErrorSnackBar(
+        scaffoldMessenger,
+        "Failed to load course streams: $e",
+      );
+    }
+  }
+
+  /// Navigates to the video player page.
+  Future<void> _navigateToVideoPlayer(
+    WidgetRef ref,
+    BuildContext context,
+    Stream clickedStream,
+  ) async {
+    // Fetch course streams only if not already fetched
+    final streams = ref.read(videoViewModelProvider).streams;
+    if (streams == null || streams.isEmpty) {
+      await ref
+          .read(videoViewModelProvider.notifier)
+          .fetchCourseStreams(widget.courseId);
+      if (!mounted) return;
+    }
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => VideoPlayerPage(
+          stream: clickedStream,
+        ),
+      ),
+    );
+  }
+
+  /// Shows an error snackbar.
+  void _showErrorSnackBar(
+    ScaffoldMessengerState scaffoldMessenger,
+    String message,
+  ) {
+    if (!mounted) return;
+    scaffoldMessenger.showSnackBar(
+      SnackBar(content: Text(message)),
+    );
+  }
+
+  bool _checkPinStatus() {
+    final userPinned = ref.watch(pinnedCourseViewModelProvider).userPinned ?? [];
+    // Iterate over the userPinned list and check if courseId matches
+    for (var course in userPinned) {
+      if (course.id == widget.courseId) {
+        return true; // Course is pinned
+      }
+    }
+    return false; // Course is not pinned
+  }
+}
diff --git a/lib/views/course_view/courses_overview.dart b/lib/views/course_view/courses_overview.dart
new file mode 100644
index 00000000..d95aadee
--- /dev/null
+++ b/lib/views/course_view/courses_overview.dart
@@ -0,0 +1,181 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/section_kind.dart';
+import 'package:gocast_mobile/views/components/base_view.dart';
+import 'package:gocast_mobile/views/course_view/components/course_section.dart';
+import 'package:gocast_mobile/views/course_view/components/live_stream_section.dart';
+import 'package:gocast_mobile/views/course_view/list_courses_view/my_courses_view.dart';
+import 'package:gocast_mobile/views/course_view/list_courses_view/public_courses_view.dart';
+import 'package:gocast_mobile/views/settings_view/settings_screen_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class CourseOverview extends ConsumerStatefulWidget {
+  const CourseOverview({super.key});
+
+  @override
+  CourseOverviewState createState() => CourseOverviewState();
+}
+
+class CourseOverviewState extends ConsumerState<CourseOverview> {
+  bool isLoading = true;
+  @override
+  void initState() {
+    super.initState();
+    final userViewModelNotifier = ref.read(userViewModelProvider.notifier);
+    final pinnedViewModelNotifier =
+        ref.read(pinnedCourseViewModelProvider.notifier);
+    final videoViewModelNotifier = ref.read(videoViewModelProvider.notifier);
+
+    Future.microtask(() async {
+      await userViewModelNotifier.fetchUserCourses();
+      await videoViewModelNotifier.fetchLiveNowStreams();
+      await videoViewModelNotifier.fetchLiveThumbnails();
+      await pinnedViewModelNotifier.fetchUserPinned();
+      await userViewModelNotifier.fetchPublicCourses();
+      await userViewModelNotifier.fetchSemesters();
+
+      setState(() {
+        isLoading = false; // Set loading to false once data is fetched
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      // Show a loading spinner when data is being fetched
+      return const Center(child: CircularProgressIndicator());
+    }
+    final userCourses = ref.watch(userViewModelProvider).userCourses ?? [];
+    final publicCourses = ref.watch(userViewModelProvider).publicCourses ?? [];
+    final liveStreams = ref.watch(videoViewModelProvider).liveStreams;
+    final liveStreamWithThumb =
+        ref.watch(videoViewModelProvider).liveStreamsWithThumb ?? [];
+
+    bool isTablet = MediaQuery.of(context).size.width >= 600 ? true : false;
+    return PopScope(
+      canPop: false,
+      child: BaseView(
+        showLeading: false,
+        title: 'GoCast',
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.settings),
+            onPressed: () => _navigateToScreen(
+              context,
+              const SettingsScreen(),
+            ),
+          ),
+        ],
+        child: RefreshIndicator(
+          onRefresh: _refreshData,
+          child: ListView(
+            children: [
+                Center(
+                    child: LiveStreamSection(
+                  ref: ref,
+                  sectionTitle: AppLocalizations.of(context)!.live_now,
+                  courses: (userCourses) + (publicCourses),
+                  streams: liveStreamWithThumb,
+                ),
+              ),
+              if (isTablet)
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: _buildSection(
+                        AppLocalizations.of(context)!.my_courses,
+                        SectionKind.myCourses,
+                        userCourses,
+                        liveStreams,
+                      ),
+                    ),
+                    Expanded(
+                      child: _buildSection(
+                        AppLocalizations.of(context)!.public_courses,
+                        SectionKind.publicCourses,
+                        publicCourses,
+                        liveStreams,
+                      ),
+                    ),
+                  ],
+                )
+              else ...[
+                _buildSection(
+                  AppLocalizations.of(context)!.my_courses,
+                  SectionKind.myCourses,
+                  userCourses,
+                  liveStreams,
+                ),
+                _buildSection(
+                  AppLocalizations.of(context)!.public_courses,
+                  SectionKind.publicCourses,
+                  publicCourses,
+                  liveStreams,
+                ),
+              ],
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSection(String title,
+      SectionKind sectionKind,
+      courses,
+      streams,) {
+    return CourseSection(
+      ref: ref,
+      sectionTitle: title,
+      sectionKind: sectionKind,
+      onViewAll: () => _onViewAllPressed(sectionKind),
+      courses: courses,
+      streams: streams,
+    );
+  }
+
+  void _onViewAllPressed(SectionKind sectionKind) {
+    switch (sectionKind) {
+      case SectionKind.myCourses:
+        _navigateTo(const MyCourses());
+        break;
+      case SectionKind.publicCourses:
+        _navigateTo(const PublicCourses());
+        break;
+      // Add more cases as needed
+      case SectionKind.livestreams:
+        break;
+    }
+  }
+
+  void _navigateTo(Widget page) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(builder: (context) => page),
+    );
+  }
+
+  void _navigateToScreen(BuildContext context, Widget screen) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(builder: (context) => screen),
+    );
+  }
+
+  Future<void> _refreshData() async {
+    setState(
+        () => isLoading = true,); // Set loading to true at the start of refresh
+
+    final userViewModelNotifier = ref.read(userViewModelProvider.notifier);
+    await userViewModelNotifier.fetchUserCourses();
+    await userViewModelNotifier.fetchPublicCourses();
+    await ref.read(videoViewModelProvider.notifier).fetchLiveNowStreams();
+    await ref.read(videoViewModelProvider.notifier).fetchLiveThumbnails();
+
+    setState(() =>
+        isLoading = false,); // Set loading to false once refresh is complete
+  }
+}
diff --git a/lib/views/course_view/courses_overview_view.dart b/lib/views/course_view/courses_overview_view.dart
deleted file mode 100644
index 4400a708..00000000
--- a/lib/views/course_view/courses_overview_view.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/main.dart';
-import 'package:gocast_mobile/views/components/base_view.dart';
-import 'package:gocast_mobile/views/course_view/components/course_overview_section.dart';
-import 'package:gocast_mobile/views/course_view/list_courses_view/my_courses_view.dart';
-import 'package:gocast_mobile/views/course_view/list_courses_view/public_courses_view.dart';
-import 'package:gocast_mobile/views/settings_view/settings_screen_view.dart';
-
-// current index of the bottom navigation bar (0 = My Courses, 1 = Public Courses)
-final currentIndexProvider = StateProvider<int>((ref) => 0);
-
-/// CourseOverview
-///
-/// A widget that displays an overview of different course sections such as
-/// "My Courses" and "Public Courses" in a scrollable column layout.
-///
-/// It includes an AppBar and a BottomNavigationBar that remain static,
-/// while the content can scroll independently. This design ensures that the
-/// AppBar and BottomNavigationBar are not rebuilt unnecessarily, improving
-/// the performance and user experience.
-class CourseOverview extends ConsumerWidget {
-  const CourseOverview({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isLoggedIn = ref.read(userViewModel).current.value.user != null;
-
-    return BaseView(
-      title: 'Go Cast',
-      actions: [
-        IconButton(
-          icon: const Icon(Icons.settings),
-          onPressed: () => _navigateToScreen(
-            context,
-            const SettingsScreen(),
-          ),
-        ),
-      ],
-      child: SingleChildScrollView(
-        child: Column(
-          children: [
-            if (isLoggedIn)
-              CourseSection(
-                sectionTitle: "My courses",
-                onViewAll: () => Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (context) => const MyCourses()),
-                ),
-              ),
-            const SizedBox(height: 20), // Space between the sections
-            CourseSection(
-              sectionTitle: "Public courses",
-              onViewAll: () => Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => const PublicCourses()),
-              ),
-            ),
-            // Add other sections or content as needed
-          ],
-        ),
-      ),
-    );
-  }
-
-  void _navigateToScreen(BuildContext context, Widget screen) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(builder: (context) => screen),
-    );
-  }
-}
diff --git a/lib/views/course_view/downloaded_courses_view/download_content_view.dart b/lib/views/course_view/downloaded_courses_view/download_content_view.dart
new file mode 100644
index 00000000..b0ac65e8
--- /dev/null
+++ b/lib/views/course_view/downloaded_courses_view/download_content_view.dart
@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/utils/constants.dart';
+import 'package:gocast_mobile/views/components/base_view.dart';
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar.dart';
+import 'package:gocast_mobile/views/course_view/components/small_stream_card.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+
+/// CourseListScreen
+///
+/// This screen displays a list of courses.
+///
+/// It takes a [title] to display the title of the section and
+/// dynamically generates a horizontal list of courses.
+class DownloadCoursesContentView extends ConsumerWidget {
+  final List<SmallStreamCard> videoCards;
+  final CustomSearchTopNavBar customAppBar;
+
+  const DownloadCoursesContentView({
+    super.key,
+    required this.videoCards,
+    required this.customAppBar,
+  });
+
+  //TODO implement filter and search functions in download view
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    double width = MediaQuery.of(context).size.width;
+
+    return BaseView(
+      customAppBar: customAppBar,
+      child: Padding(
+        padding: const EdgeInsets.only(left: 8.0, right: 8.0, top: 8.0),
+        child: Padding(
+          padding: EdgeInsets.symmetric(
+            horizontal:
+                width >= 600 ? MediaQuery.of(context).size.width * 0.15 : 0,
+          ),
+          child: ListView.builder(
+            itemCount: videoCards.isEmpty ? 1 : videoCards.length,
+            itemBuilder: (BuildContext context, int index) {
+              if (videoCards.isEmpty) {
+                return  Center(
+                  child: Padding(
+                    padding: AppPadding.sectionPadding,
+                    child: Center(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 295.0),
+                        child: Text(AppLocalizations.of(context)!.no_downloaded_courses),
+                      ),
+                    ),
+                  ),
+                );
+              } else {
+                return videoCards[index];
+              }
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/course_view/downloaded_courses_view/downloaded_courses_view.dart b/lib/views/course_view/downloaded_courses_view/downloaded_courses_view.dart
new file mode 100644
index 00000000..7c1bbb09
--- /dev/null
+++ b/lib/views/course_view/downloaded_courses_view/downloaded_courses_view.dart
@@ -0,0 +1,103 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/models/download/download_state_model.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar.dart';
+import 'package:gocast_mobile/views/course_view/components/small_stream_card.dart';
+import 'package:gocast_mobile/views/course_view/downloaded_courses_view/download_content_view.dart';
+import 'package:gocast_mobile/views/video_view/offline_video_player/offline_video_player.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class DownloadedCourses extends ConsumerStatefulWidget {
+  const DownloadedCourses({super.key});
+
+  @override
+  DownloadedCoursesState createState() => DownloadedCoursesState();
+}
+
+class DownloadedCoursesState extends ConsumerState<DownloadedCourses> {
+  final TextEditingController searchController = TextEditingController();
+
+  void _showDeleteConfirmationDialog(int videoId) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title:  Text(AppLocalizations.of(context)!.confirm_delete),
+          content: Text(AppLocalizations.of(context)!.confirm_delete_message),
+          actions: <Widget>[
+            TextButton(
+              child: Text(AppLocalizations.of(context)!.cancel),
+              onPressed: () {
+                Navigator.of(context).pop(); // Dismiss the dialog
+              },
+            ),
+            TextButton(
+              child: Text(AppLocalizations.of(context)!.delete),
+              onPressed: () async {
+                Navigator.of(context).pop(); // Dismiss the dialog
+                await ref
+                    .read(downloadViewModelProvider.notifier)
+                    .deleteDownload(videoId);
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  //TODO: void _handleSortOptionSelected(String choice) {}
+
+  @override
+  Widget build(BuildContext context) {
+    final downloadedVideos =
+        ref.watch(downloadViewModelProvider).downloadedVideos;
+
+    return Scaffold(
+      body: RefreshIndicator(
+        onRefresh: () async {
+          await ref
+              .read(downloadViewModelProvider.notifier)
+              .fetchDownloadedVideos();
+        },
+        child: DownloadCoursesContentView(
+          customAppBar: CustomSearchTopNavBar(
+            searchController: searchController,
+            title: AppLocalizations.of(context)!.download,
+            filterOptions: [AppLocalizations.of(context)!.newest_first, AppLocalizations.of(context)!.oldest_first],
+            onClick: (String choice) {
+              // Handle filter option click
+            },
+          ),
+          videoCards: downloadedVideos.entries.map((entry) {
+            final int videoId = entry.key;
+            final VideoDetails videoDetails = entry.value;
+            final String localPath = videoDetails.filePath;
+            final String videoName = videoDetails.name;
+            final int durationSeconds = videoDetails.duration;
+            final String formattedDuration = "${(durationSeconds ~/ 3600).toString().padLeft(2, '0')}:${((durationSeconds % 3600) ~/ 60).toString().padLeft(2, '0')}:${(durationSeconds % 60).toString().padLeft(2, '0')}";
+            return  SmallStreamCard(
+              isDownloaded: true,
+                courseId: videoId,
+                title: videoName,
+                subtitle: formattedDuration,
+                tumID: "TUMID",
+                showDeleteConfirmationDialog: _showDeleteConfirmationDialog,
+                onTap: () {
+                Navigator.of(context).push(
+                MaterialPageRoute(
+               builder: (context) =>
+               OfflineVideoPlayerPage(localPath: localPath),
+               ),
+               );
+              },
+    );
+          }).toList(),
+        ),
+      ),
+    );
+
+  }
+}
\ No newline at end of file
diff --git a/lib/views/course_view/downloaded_pinned_courses_view/content_view.dart b/lib/views/course_view/downloaded_pinned_courses_view/content_view.dart
deleted file mode 100644
index 40fe0668..00000000
--- a/lib/views/course_view/downloaded_pinned_courses_view/content_view.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/views/course_view/components/courselist_screen.dart';
-import 'package:gocast_mobile/views/video_view/video_card_view.dart';
-
-/// CourseContentScreen
-///
-/// A reusable widget that displays a list of video cards under a specific title.
-/// This widget is designed to be flexible and can be used to represent various
-/// types of course-related content, such as pinned courses or downloaded courses.
-///
-/// Parameters:
-///   [title] - The title of the content section.
-///   [videoCards] - A list of VideoCard widgets to be displayed under the title.
-class CourseContentScreen extends ConsumerWidget {
-  final String title;
-  final List<VideoCard> videoCards;
-
-  const CourseContentScreen({
-    super.key,
-    required this.title,
-    required this.videoCards,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return CourseListScreen(
-      title: title,
-      videoCards: videoCards,
-    );
-  }
-}
diff --git a/lib/views/course_view/downloaded_pinned_courses_view/downloaded_courses_view.dart b/lib/views/course_view/downloaded_pinned_courses_view/downloaded_courses_view.dart
deleted file mode 100644
index e981b894..00000000
--- a/lib/views/course_view/downloaded_pinned_courses_view/downloaded_courses_view.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/views/course_view/downloaded_pinned_courses_view/content_view.dart';
-import 'package:gocast_mobile/views/video_view/video_card_view.dart';
-
-/// DownloadsScreen
-///
-/// A widget representing the 'Downloads' section of the app.
-/// It displays courses that the user has downloaded for offline viewing.
-/// Like PinnedCourses, it also uses the CourseContentScreen for displaying its content.
-class DownloadedCourses extends ConsumerWidget {
-  const DownloadedCourses({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return const CourseContentScreen(
-      title: 'Downloads',
-      videoCards: [
-        VideoCard(
-          imageName: 'assets/images/course1.png',
-          title: 'Lineare Algebra für Informatik [MA0901]',
-          date: 'July 24, 2019',
-          duration: '02:00:00',
-        ),
-        // Add more VideoCard widgets as needed
-      ],
-    );
-  }
-}
diff --git a/lib/views/course_view/downloaded_pinned_courses_view/pinned_courses_view.dart b/lib/views/course_view/downloaded_pinned_courses_view/pinned_courses_view.dart
deleted file mode 100644
index 2c9b16ed..00000000
--- a/lib/views/course_view/downloaded_pinned_courses_view/pinned_courses_view.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/views/course_view/downloaded_pinned_courses_view/content_view.dart';
-import 'package:gocast_mobile/views/video_view/video_card_view.dart';
-
-/// PinnedCourses
-///
-/// A widget representing the 'Pinned Courses' section of the app.
-/// It utilizes the CourseContentScreen to display a list of courses
-/// that the user has pinned.
-class PinnedCourses extends ConsumerWidget {
-  const PinnedCourses({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return const CourseContentScreen(
-      title: 'Pinned',
-      videoCards: [
-        VideoCard(
-          imageName: 'assets/images/course2.png',
-          title: 'Computer Science [CS202]',
-          date: 'July 23, 2019',
-          duration: '02:00:00',
-        ),
-        // Add more VideoCard widgets as needed
-      ],
-    );
-  }
-}
diff --git a/lib/views/course_view/list_courses_view/courses_list_view.dart b/lib/views/course_view/list_courses_view/courses_list_view.dart
new file mode 100644
index 00000000..2b5b24ea
--- /dev/null
+++ b/lib/views/course_view/list_courses_view/courses_list_view.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/constants.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+import 'package:gocast_mobile/views/course_view/components/course_card.dart';
+import 'package:gocast_mobile/views/course_view/course_detail_view/course_detail_view.dart';
+
+/// CoursesScreen
+///
+/// This screen displays a list of courses.
+///
+/// It takes a [title] to display the title of the section and
+/// dynamically generates a horizontal list of courses. This widget can be
+/// reused for various course sections by providing different titles and
+/// course lists.
+class CoursesList extends ConsumerWidget {
+  final String title;
+  final List<Course> courses;
+
+  const CoursesList({
+    super.key,
+    required this.title,
+    required this.courses,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    bool isTablet = MediaQuery.of(context).size.width >= 600;
+    return courses.isEmpty
+        ? _buildPlaceholder(context)
+        : _buildCourseListView(context, isTablet, ref);
+  }
+
+  Padding _buildPlaceholder(BuildContext context) {
+    return Padding(
+      padding: AppPadding.sectionPadding,
+      child: Center(child: Text(AppLocalizations.of(context)!.no_courses_found)),
+    );
+  }
+
+  Widget _buildCourseListView(
+    BuildContext context,
+    bool isTablet,
+    WidgetRef ref,
+  ) {
+    final liveStreams = ref.watch(videoViewModelProvider).liveStreams ?? [];
+    var liveCourseIds = liveStreams.map((stream) => stream.courseID).toSet();
+    final userPinned = ref.watch(pinnedCourseViewModelProvider).userPinned ?? [];
+    List<Course> liveCourses =
+        courses.where((course) => liveCourseIds.contains(course.id)).toList();
+    return ListView.builder(
+        shrinkWrap: true,
+        physics: const NeverScrollableScrollPhysics(),
+        scrollDirection: Axis.vertical,
+        itemCount: courses.length,
+        itemBuilder: (BuildContext context, int index) {
+          final course = courses[index];
+          final isPinned = userPinned.contains(course);
+          return CourseCard(
+            isLoggedIn: ref.read(userViewModelProvider).user != null,
+            course: course,
+            isPinned: isPinned,
+            onPinUnpin: (course) {
+              final pinnedViewModelNotifier =
+                  ref.read(pinnedCourseViewModelProvider.notifier);
+              if (isPinned) {
+                pinnedViewModelNotifier.unpinCourse(course.id);
+              } else {
+                pinnedViewModelNotifier.pinCourse(course.id);
+              }
+            },
+            title: course.name,
+            tumID: course.tUMOnlineIdentifier,
+            live: liveCourses.contains(course),
+            courseId: course.id,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => CourseDetail(
+                    title: course.name,
+                    courseId: course.id,
+                  ),
+                ),
+              );
+            },
+          );
+        },);
+  }
+}
diff --git a/lib/views/course_view/list_courses_view/my_courses_view.dart b/lib/views/course_view/list_courses_view/my_courses_view.dart
index ff0debbf..bab0da0e 100644
--- a/lib/views/course_view/list_courses_view/my_courses_view.dart
+++ b/lib/views/course_view/list_courses_view/my_courses_view.dart
@@ -1,27 +1,104 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:gocast_mobile/models/course/course_model.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar_back_button.dart';
+import 'package:gocast_mobile/views/course_view/list_courses_view/courses_list_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import '../../utils/constants.dart';
-import '../components/course_screen.dart';
-
-/// MyCourses Screen
-/// This screen displays a list of My Courses.
-///
-class MyCourses extends StatelessWidget {
+class MyCourses extends ConsumerStatefulWidget {
   const MyCourses({super.key});
 
+  @override
+  MyCoursesState createState() => MyCoursesState();
+}
+
+class MyCoursesState extends ConsumerState<MyCourses> {
+  bool isLoading = true;
+  final TextEditingController searchController = TextEditingController();
+  late List<Course> temp;
+  bool isSearchInitialized = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeCourses();
+    searchController.addListener(_searchCourses);
+  }
+
+  void _initializeCourses() {
+    final userViewModelNotifier = ref.read(userViewModelProvider.notifier);
+    Future.microtask(() async {
+      await userViewModelNotifier.fetchUserCourses();
+    });
+  }
+
+  Future<void> _refreshMyCourses() async {
+    await ref.read(userViewModelProvider.notifier).fetchUserCourses();
+  }
+
+  void filterCoursesBySemester(String selectedSemester) {
+    var allUserCourses = ref.watch(userViewModelProvider).userCourses ?? [];
+    ref
+        .read(userViewModelProvider.notifier)
+        .updateSelectedSemester(selectedSemester, allUserCourses);
+  }
+
+  void _searchCourses() {
+    final userViewModelNotifier = ref.read(userViewModelProvider.notifier);
+    final searchInput = searchController.text.toLowerCase();
+    var displayedCourses =
+        ref.watch(userViewModelProvider).displayedCourses ?? [];
+    if (!isSearchInitialized) {
+      temp = List.from(displayedCourses);
+      isSearchInitialized = true;
+    }
+
+    if (searchInput.isEmpty) {
+      userViewModelNotifier.updatedDisplayedCourses(temp);
+      isSearchInitialized = false;
+    } else {
+      displayedCourses = displayedCourses.where((course) {
+        return course.name.toLowerCase().contains(searchInput) ||
+            course.slug.toLowerCase().contains(searchInput);
+      }).toList();
+      userViewModelNotifier.updatedDisplayedCourses(displayedCourses);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    return CoursesScreen(
-      title: 'My Courses',
-      courses: [
-        CourseModel(
-          title: 'PSY101',
-          subtitle: 'Introduction to Psychology',
-          imagePath: AppImages.course1,
+    final myCourses = ref.watch(userViewModelProvider).displayedCourses ?? [];
+    final filterOptions =
+        ref.watch(userViewModelProvider).semestersAsString ?? [];
+    return Scaffold(
+      appBar: CustomSearchTopNavBarWithBackButton(
+        searchController: searchController,
+        filterOptions: filterOptions,
+        onClick: filterCoursesBySemester,
+      ),
+      body: RefreshIndicator(
+        triggerMode: RefreshIndicatorTriggerMode.onEdge,
+        onRefresh: _refreshMyCourses,
+        child: ListView(
+          physics: const AlwaysScrollableScrollPhysics(),
+          scrollDirection: Axis.vertical,
+          dragStartBehavior: DragStartBehavior.down,
+          children: [
+            CoursesList(
+              title: AppLocalizations.of(context)!.my_courses,
+              courses: myCourses,
+            ),
+          ],
         ),
-        // Add more courses as needed
-      ],
+      ),
     );
   }
+
+  @override
+  void dispose() {
+    searchController.dispose();
+    super.dispose();
+  }
 }
diff --git a/lib/views/course_view/list_courses_view/public_courses_view.dart b/lib/views/course_view/list_courses_view/public_courses_view.dart
index c11ae834..31c913d9 100644
--- a/lib/views/course_view/list_courses_view/public_courses_view.dart
+++ b/lib/views/course_view/list_courses_view/public_courses_view.dart
@@ -1,26 +1,100 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:gocast_mobile/models/course/course_model.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pbgrpc.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar_back_button.dart';
+import 'package:gocast_mobile/views/course_view/list_courses_view/courses_list_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import '../../utils/constants.dart';
-import '../components/course_screen.dart';
-
-/// PublicCourses Screen
-/// This screen displays a list of Public Courses.
-class PublicCourses extends StatelessWidget {
+class PublicCourses extends ConsumerStatefulWidget {
   const PublicCourses({super.key});
 
+  @override
+  PublicCoursesState createState() => PublicCoursesState();
+}
+
+class PublicCoursesState extends ConsumerState<PublicCourses> {
+  bool isLoading = true;
+  final TextEditingController searchController = TextEditingController();
+  late List<Course> temp;
+  bool isSearchInitialized = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeCourses();
+    searchController.addListener(_searchCourses);
+  }
+
+  void _initializeCourses() {
+    final userViewModelNotifier = ref.read(userViewModelProvider.notifier);
+    Future.microtask(() async {
+      await userViewModelNotifier.fetchPublicCourses();
+      await userViewModelNotifier.fetchSemesters();
+    });
+  }
+
+  Future<void> _refreshPublicCourses() async {
+    await ref.read(userViewModelProvider.notifier).fetchPublicCourses();
+  }
+
+  void filterCoursesBySemester(String selectedSemester) {
+    var allUserCourses = ref.watch(userViewModelProvider).publicCourses ?? [];
+    ref
+        .read(userViewModelProvider.notifier)
+        .updateSelectedSemester(selectedSemester, allUserCourses);
+  }
+
+  void _searchCourses() {
+    final userViewModelNotifier = ref.read(userViewModelProvider.notifier);
+    final searchInput = searchController.text.toLowerCase();
+    var displayedCourses =
+        ref.watch(userViewModelProvider).displayedCourses ?? [];
+    if (!isSearchInitialized) {
+      temp = List.from(displayedCourses);
+      isSearchInitialized = true;
+    }
+
+    if (searchInput.isEmpty) {
+      userViewModelNotifier.updatedDisplayedCourses(temp);
+      isSearchInitialized = false;
+    } else {
+      displayedCourses = displayedCourses.where((course) {
+        return course.name.toLowerCase().contains(searchInput) ||
+            course.slug.toLowerCase().contains(searchInput);
+      }).toList();
+      userViewModelNotifier.updatedDisplayedCourses(displayedCourses);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    return CoursesScreen(
-      title: 'Public Courses',
-      courses: [
-        CourseModel(
-          title: 'PSY101',
-          subtitle: 'Public Psychology Course',
-          imagePath: AppImages.course1,
+    final publicCourses =
+        ref.watch(userViewModelProvider).displayedCourses ?? [];
+    final filterOptions =
+        ref.watch(userViewModelProvider).semestersAsString ?? [];
+    return Scaffold(
+      appBar: CustomSearchTopNavBarWithBackButton(
+        searchController: searchController,
+        filterOptions: filterOptions,
+        onClick: filterCoursesBySemester,
+      ),
+      body: RefreshIndicator(
+        triggerMode: RefreshIndicatorTriggerMode.onEdge,
+        onRefresh: _refreshPublicCourses,
+        child: ListView(
+          physics: const AlwaysScrollableScrollPhysics(),
+          scrollDirection: Axis.vertical,
+          dragStartBehavior: DragStartBehavior.down,
+          children: [
+            CoursesList(
+              courses: publicCourses,
+              title: AppLocalizations.of(context)!.public_courses,
+            ),
+          ],
         ),
-        // Add more courses as needed
-      ],
+      ),
     );
   }
 }
diff --git a/lib/views/course_view/pinned_courses_view/pinned_courses_content_view.dart b/lib/views/course_view/pinned_courses_view/pinned_courses_content_view.dart
new file mode 100644
index 00000000..5c44ad92
--- /dev/null
+++ b/lib/views/course_view/pinned_courses_view/pinned_courses_content_view.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/utils/constants.dart';
+import 'package:gocast_mobile/views/components/base_view.dart';
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+import 'package:gocast_mobile/views/course_view/components/course_card.dart';
+
+/// PinnedCoursesContentView
+///
+/// A widget that presents a list of pinned course cards organized under a specific title.
+/// This widget is versatile and can be employed to showcase different types of
+/// course-related content, including pinned courses or downloaded courses.
+///
+/// Parameters:
+///   [pinnedCourseCards] - A list of cards representing pinned courses.
+///
+class PinnedCoursesContentView extends ConsumerWidget {
+  final List<CourseCard> pinnedCourseCards;
+  final CustomSearchTopNavBar customAppBar;
+
+  const PinnedCoursesContentView({
+    super.key,
+    required this.pinnedCourseCards,
+    required this.customAppBar,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    double width = MediaQuery.of(context).size.width;
+
+    return BaseView(
+      customAppBar: customAppBar,
+      child: Padding(
+        padding: const EdgeInsets.only(left: 8.0, right: 8.0, top: 8.0),
+        child: Padding(
+          padding: EdgeInsets.symmetric(
+            horizontal:
+                width >= 600 ? MediaQuery.of(context).size.width * 0.15 : 0,
+          ),
+          child: ListView.builder(
+            itemCount: pinnedCourseCards.isEmpty ? 1 : pinnedCourseCards.length,
+            itemBuilder: (BuildContext context, int index) {
+              if (pinnedCourseCards.isEmpty) {
+                return Center(
+                  child: Padding(
+                    padding: AppPadding.sectionPadding,
+                    child: Center(
+                      child: Padding(
+                        padding: AppPadding.sectionPadding,
+                        child: Center(
+                          child: Padding(
+                            padding: const EdgeInsets.symmetric(vertical: 295.0),
+                            child: Text(AppLocalizations.of(context)!.pinned_empty,),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                );
+              } else {
+                return Padding(
+                  padding: EdgeInsets.only(bottom: width * 0.02),
+                  child: pinnedCourseCards[index],
+                );
+              }
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/course_view/pinned_courses_view/pinned_courses_view.dart b/lib/views/course_view/pinned_courses_view/pinned_courses_view.dart
new file mode 100644
index 00000000..d03e8835
--- /dev/null
+++ b/lib/views/course_view/pinned_courses_view/pinned_courses_view.dart
@@ -0,0 +1,142 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/components/custom_search_top_nav_bar.dart';
+import 'package:gocast_mobile/views/course_view/components/course_card.dart';
+import 'package:gocast_mobile/views/course_view/course_detail_view/course_detail_view.dart';
+import 'package:gocast_mobile/views/course_view/pinned_courses_view/pinned_courses_content_view.dart';
+import 'package:gocast_mobile/views/video_view/video_player_controller.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class PinnedCourses extends ConsumerStatefulWidget {
+  const PinnedCourses({super.key});
+
+  @override
+  PinnedCoursesState createState() => PinnedCoursesState();
+}
+
+class PinnedCoursesState extends ConsumerState<PinnedCourses> {
+  final TextEditingController searchController = TextEditingController();
+  late List<Course> temp;
+  bool isSearchInitialized = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeCourses();
+    searchController.addListener(_searchCourses);
+  }
+
+  void _initializeCourses() {
+    final pinnedCourseViewModelNotifier =
+        ref.read(pinnedCourseViewModelProvider.notifier);
+    Future.microtask(() async {
+      await pinnedCourseViewModelNotifier.fetchUserPinned();
+    });
+  }
+
+  Future<void> _refreshPinnedCourses() async {
+    await ref.read(pinnedCourseViewModelProvider.notifier).fetchUserPinned();
+  }
+
+  void filterCoursesBySemester(String selectedSemester) {
+    var userPinned = ref.watch(pinnedCourseViewModelProvider).userPinned ?? [];
+    ref
+        .read(pinnedCourseViewModelProvider.notifier)
+        .updateSelectedPinnedSemester(selectedSemester, userPinned);
+  }
+
+  void _searchCourses() {
+    final pinnedViewModelNotifier =
+        ref.read(pinnedCourseViewModelProvider.notifier);
+    final searchInput = searchController.text.toLowerCase();
+    var displayedCourses =
+        ref.watch(pinnedCourseViewModelProvider).displayedPinnedCourses ?? [];
+    if (!isSearchInitialized) {
+      temp = List.from(displayedCourses);
+      isSearchInitialized = true;
+    }
+    if (searchInput.isEmpty) {
+      pinnedViewModelNotifier.updatedDisplayedPinnedCourses(temp);
+      isSearchInitialized = false;
+    } else {
+      displayedCourses = displayedCourses.where((course) {
+        return course.name.toLowerCase().contains(searchInput) ||
+            course.slug.toLowerCase().contains(searchInput);
+      }).toList();
+      pinnedViewModelNotifier.updatedDisplayedPinnedCourses(displayedCourses);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final userPinned =
+        ref.watch(pinnedCourseViewModelProvider).displayedPinnedCourses ?? [];
+    final liveStreams = ref.watch(videoViewModelProvider).liveStreams ?? [];
+    var liveCourseIds = liveStreams.map((stream) => stream.courseID).toSet();
+    List<Course> liveCourses = userPinned
+        .where((course) => liveCourseIds.contains(course.id))
+        .toList();
+    final filterOptions =
+        ref.watch(userViewModelProvider).semestersAsString ?? [];
+    return Scaffold(
+      body: RefreshIndicator(
+        onRefresh: _refreshPinnedCourses,
+        child: PinnedCoursesContentView(
+          customAppBar: CustomSearchTopNavBar(
+            searchController: searchController,
+            title: AppLocalizations.of(context)!.pinned_courses,
+            filterOptions: filterOptions,
+            onClick: filterCoursesBySemester,
+          ),
+          pinnedCourseCards: userPinned.map((course) {
+            final isPinned =
+                userPinned.any((pinnedCourse) => pinnedCourse.id == course.id);
+            return CourseCard(
+              isLoggedIn: true,
+              course: course,
+              isPinned: isPinned,
+              onPinUnpin: (course) => _togglePin(course, isPinned),
+              live: liveCourses.contains(course),
+              title: course.name,
+              courseId: course.id,
+              subtitle: course.tUMOnlineIdentifier,
+              tumID: course.tUMOnlineIdentifier,
+              onTap: () => _handleCourseTap(course, context),
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+
+  Future<void> _handleCourseTap(Course course, BuildContext context) async {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => CourseDetail(
+          title: course.name,
+          courseId: course.id,
+        ),
+      ),
+    );
+  }
+
+  Future<void> _togglePin(Course course, bool isPinned) async {
+    final pinnedViewModel = ref.read(pinnedCourseViewModelProvider.notifier);
+    if (isPinned) {
+      await pinnedViewModel.unpinCourse(course.id);
+    } else {
+      await pinnedViewModel.pinCourse(course.id);
+    }
+    await _refreshPinnedCourses();
+  }
+
+  VideoSourceType determineSourceType(String videoSource) {
+    return videoSource.startsWith('http')
+        ? VideoSourceType.network
+        : VideoSourceType.asset;
+  }
+}
diff --git a/lib/views/login_view/internal_login_view.dart b/lib/views/login_view/internal_login_view.dart
index fcf27308..61ba4fad 100644
--- a/lib/views/login_view/internal_login_view.dart
+++ b/lib/views/login_view/internal_login_view.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/main.dart';
-import 'package:gocast_mobile/view_models/UserViewModel.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
 
 /// Internal login screen view.
 ///
@@ -10,12 +11,26 @@ import 'package:gocast_mobile/view_models/UserViewModel.dart';
 /// a forgot password button and a login button.
 /// The login button calls the basic authentication function from /base/api/auth
 /// The forgot password button does nothing for now.
-class InternalLoginScreen extends ConsumerWidget {
+class InternalLoginScreen extends ConsumerStatefulWidget {
   const InternalLoginScreen({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final userViewModelRef = ref.watch(userViewModel);
+  InternalLoginScreenState createState() => InternalLoginScreenState();
+}
+
+class InternalLoginScreenState extends ConsumerState<InternalLoginScreen> {
+  final TextEditingController usernameController = TextEditingController();
+  final TextEditingController passwordController = TextEditingController();
+
+  @override
+  void dispose() {
+    usernameController.dispose();
+    passwordController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(),
       body: SafeArea(
@@ -26,26 +41,23 @@ class InternalLoginScreen extends ConsumerWidget {
               crossAxisAlignment: CrossAxisAlignment.stretch,
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                _buildWelcomeText(),
+                _buildWelcomeText(context),
                 const SizedBox(height: 48),
                 _buildTextField(
-                  'Username',
+                  AppLocalizations.of(context)!.username,
                   'e.g. go42tum / example@tum.de',
-                  userViewModelRef.usernameController,
+                  usernameController,
                 ),
                 const SizedBox(height: 24),
                 _buildTextField(
-                  'Password',
-                  'Enter your password',
-                  userViewModelRef.passwordController,
+                  AppLocalizations.of(context)!.password,
+                  AppLocalizations.of(context)!.enter_your_password,
+                  passwordController,
                   obscureText: true,
                 ),
-                _buildForgotPasswordButton(),
+                _buildForgotPasswordButton(context),
                 const SizedBox(height: 24),
-                _buildLoginButton(
-                  context,
-                  ref,
-                ),
+                _buildLoginButton(context, ref),
               ],
             ),
           ),
@@ -54,9 +66,9 @@ class InternalLoginScreen extends ConsumerWidget {
     );
   }
 
-  Widget _buildWelcomeText() {
+  Widget _buildWelcomeText(BuildContext context) {
     return Text(
-      'Welcome To GoCast!',
+      AppLocalizations.of(context)!.welcome_to_gocast,
       textAlign: TextAlign.center,
       style: TextStyle(
         color: Colors.blue[900],
@@ -91,24 +103,20 @@ class InternalLoginScreen extends ConsumerWidget {
     );
   }
 
-  Widget _buildForgotPasswordButton() {
+  Widget _buildForgotPasswordButton(BuildContext context) {
     return TextButton(
       onPressed: () {
         // TODO: Forgot Password action
       },
-      child: const Text(
-        'Forgot Password?',
-        style: TextStyle(color: Colors.blue),
+      child: Text(
+        AppLocalizations.of(context)!.forgot_password,
+        style: const TextStyle(color: Colors.blue),
       ),
     );
   }
 
-  Widget _buildLoginButton(
-    BuildContext context,
-    WidgetRef ref,
-  ) {
-    final userViewModelRef = ref.watch(userViewModel);
-    final viewModel = ref.watch(userViewModelProvider.notifier);
+  Widget _buildLoginButton(BuildContext context, WidgetRef ref) {
+    final userState = ref.watch(userViewModelProvider);
     return ElevatedButton(
       style: ElevatedButton.styleFrom(
         foregroundColor: Colors.white,
@@ -118,11 +126,19 @@ class InternalLoginScreen extends ConsumerWidget {
           borderRadius: BorderRadius.circular(15.0),
         ),
       ),
-      onPressed: () => {
-        userViewModelRef.handleBasicLogin(context),
-        viewModel.resetControllers(),
+      onPressed: () {
+        final userStateNotifier = ref.read(userViewModelProvider.notifier);
+        userStateNotifier.handleBasicLogin(
+          usernameController.text,
+          passwordController.text,
+        );
+        if ( userState.user != null) {
+          ref.read(settingViewModelProvider.notifier).fetchUserSettings();
+        } else {
+          userState.copyWith(isLoading: false);
+        }
       },
-      child: viewModel.current.value.isLoading
+      child: userState.isLoading
           ? const CircularProgressIndicator(color: Colors.white, strokeWidth: 2)
           : const Text('Login', style: TextStyle(fontSize: 18)),
     );
diff --git a/lib/views/notifications_view/notifications_overview.dart b/lib/views/notifications_view/notifications_overview.dart
new file mode 100644
index 00000000..2a053b47
--- /dev/null
+++ b/lib/views/notifications_view/notifications_overview.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'notifications_screen_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class MyNotifications extends ConsumerStatefulWidget {
+  const MyNotifications({super.key});
+
+  @override
+  MyNotificationsState createState() => MyNotificationsState();
+}
+
+class MyNotificationsState extends ConsumerState<MyNotifications> {
+  @override
+  void initState() {
+    super.initState();
+    Future.microtask(() async {
+      await ref
+          .read(notificationViewModelProvider.notifier)
+          .fetchFeatureNotifications();
+      await ref
+          .read(notificationViewModelProvider.notifier)
+          .fetchBannerAlerts();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final notificationState = ref.watch(notificationViewModelProvider);
+
+    final pushNotifications = notificationState.pushNotifications ?? [];
+    final featureNotifications = notificationState.featureNotifications ?? [];
+    final bannerAlerts = notificationState.bannerAlerts ?? [];
+
+    return NotificationsScreen(
+      title: AppLocalizations.of(context)!.notifications,
+      pushNotifications: pushNotifications,
+      featureNotifications: featureNotifications,
+      bannerAlerts: bannerAlerts,
+      onRefresh: _refreshNotifications,
+    );
+  }
+
+  Future<void> _refreshNotifications() async {
+    await ref.read(notificationViewModelProvider.notifier).fetchBannerAlerts();
+    await ref
+        .read(notificationViewModelProvider.notifier)
+        .fetchFeatureNotifications();
+  }
+}
diff --git a/lib/views/notifications_view/notifications_screen_view.dart b/lib/views/notifications_view/notifications_screen_view.dart
index 681696a7..00ce7c03 100644
--- a/lib/views/notifications_view/notifications_screen_view.dart
+++ b/lib/views/notifications_view/notifications_screen_view.dart
@@ -1,53 +1,190 @@
+import 'package:gocast_mobile/views/components/base_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/views/components/base_view.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/models/notifications/push_notification.dart';
+import 'package:gocast_mobile/utils/constants.dart';
+import 'package:gocast_mobile/views/settings_view/settings_screen_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
 
 class NotificationsScreen extends ConsumerWidget {
-  NotificationsScreen({super.key});
-
-  final Map<String, List<String>> notifications = {
-    'Today': [
-      'Lineare Algebra für Informatik is live now!',
-      'Functional Programming and verification is live now!',
-    ],
-    'Yesterday': [
-      'Lineare Algebra für Informatik is live now!',
-      'Functional Programming and verification is live now!',
-    ],
-    'November 25': [
-      'Lineare Algebra für Informatik is live now!',
-      'Functional Programming and verification is live now!',
-    ],
-    // Add more data here
-  };
+  final String title;
+  final List<PushNotification> pushNotifications;
+  final List<FeatureNotification> featureNotifications;
+  final List<BannerAlert> bannerAlerts;
+  final Future<void> Function() onRefresh;
+
+  const NotificationsScreen({
+    super.key,
+    required this.title,
+    required this.pushNotifications,
+    required this.featureNotifications,
+    required this.bannerAlerts,
+    required this.onRefresh,
+  });
 
+  // A basic functioning view that supports all notification related functions
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseView(
-      title: 'Notifications',
-      child: ListView.builder(
-        itemCount: notifications.keys.length,
-        itemBuilder: (context, index) {
-          String key = notifications.keys.elementAt(index);
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: Text(
-                  key,
-                  style: Theme.of(context).textTheme.titleLarge,
-                ),
+      showLeading: false,
+      title: title,
+      actions: _buildAppBarActions(context, ref),
+      child: RefreshIndicator(
+        onRefresh: onRefresh,
+        child: pushNotifications.isEmpty &&
+                featureNotifications.isEmpty &&
+                bannerAlerts.isEmpty
+            ? _buildPlaceholder(context)
+            : ListView(
+                physics: const AlwaysScrollableScrollPhysics(),
+                scrollDirection: Axis.vertical,
+                children: [
+                  _buildSectionHeader(AppLocalizations.of(context)!.banner_notification),
+                  for (var alert in bannerAlerts) _buildBannerAlert(alert),
+                  _buildSectionHeader(AppLocalizations.of(context)!.feature_notifications),
+                  for (var notification in featureNotifications)
+                    _buildFeatureNotification(notification),
+                  _buildSectionHeader(AppLocalizations.of(context)!.recent_uploads),
+                  for (var notification in pushNotifications)
+                    _buildPushNotification(notification),
+                ],
               ),
-              ...notifications[key]!.map(
-                (notification) => ListTile(
-                  title: Text(notification),
-                  trailing: const Text('06:30'),
-                ),
+      ),
+    );
+  }
+
+  Padding _buildPlaceholder(BuildContext context) {
+    return Padding(
+      padding: AppPadding.sectionPadding,
+      child: Center(
+        child: SingleChildScrollView(
+          physics: const AlwaysScrollableScrollPhysics(),
+          child: ConstrainedBox(
+            constraints: BoxConstraints(
+              minHeight: MediaQuery.of(context).size.height -
+                  MediaQuery.of(context).padding.top -
+                  MediaQuery.of(context).padding.bottom -
+                  kToolbarHeight,
+            ),
+            child: IntrinsicHeight(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Expanded(
+                    child: Center(child: Text(AppLocalizations.of(context)!.no_notifications_found)),
+                  ),
+                ],
               ),
-            ],
-          );
-        },
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  List<Widget> _buildAppBarActions(BuildContext context, WidgetRef ref) {
+    return [
+      IconButton(
+        icon: const Icon(Icons.settings),
+        onPressed: () => Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) => const SettingsScreen()),
+        ),
+      ),
+    ];
+  }
+
+  Widget _buildSectionHeader(String title) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Text(
+        title,
+        style: const TextStyle(
+          fontWeight: FontWeight.bold,
+          fontSize: 18.0,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPushNotification(PushNotification notification) {
+    return Card(
+      margin: const EdgeInsets.all(8.0),
+      child: ListTile(
+        leading: const Icon(Icons.notifications_active, color: Colors.green),
+        title: Text(
+          notification.title,
+          style: const TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 16.0,
+          ),
+        ),
+        subtitle: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              notification.body,
+              style: TextStyle(
+                color: Colors.grey[700],
+              ),
+            ),
+            Text(
+              'Received at: ${notification.receivedAt}',
+              style: TextStyle(
+                color: Colors.grey[600],
+                fontSize: 12.0,
+              ),
+            ),
+          ],
+        ),
+        // trailing: const Icon(Icons.arrow_forward_ios, size: 14.0),
+      ),
+    );
+  }
+
+  Widget _buildFeatureNotification(FeatureNotification notification) {
+    return Card(
+      margin: const EdgeInsets.all(8.0),
+      child: ListTile(
+        leading:
+            const Icon(Icons.notifications_sharp, color: Colors.blueAccent),
+        title: Text(
+          notification.title.isEmpty ? "User notification" : notification.title,
+          style: const TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 16.0,
+          ),
+        ),
+        subtitle: Text(
+          notification.body,
+          style: TextStyle(
+            color: Colors.grey[700],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildBannerAlert(BannerAlert alert) {
+    return Card(
+      color: alert.warn ? Colors.redAccent : Colors.blueAccent,
+      margin: const EdgeInsets.all(8.0),
+      child: ListTile(
+        title: Text(
+          alert.text,
+          style: const TextStyle(color: Colors.white),
+        ),
+        subtitle: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Start Date: ${alert.startsAt}\nEnd Date: ${alert.expiresAt}',
+              style: const TextStyle(color: Colors.white),
+            ),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/views/on_boarding_view/enable_notification_view.dart b/lib/views/on_boarding_view/enable_notification_view.dart
index 67765c99..e6b62868 100644
--- a/lib/views/on_boarding_view/enable_notification_view.dart
+++ b/lib/views/on_boarding_view/enable_notification_view.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
 
 class EnableNotificationscreen extends StatelessWidget {
   const EnableNotificationscreen({super.key});
@@ -20,20 +22,20 @@ class EnableNotificationscreen extends StatelessWidget {
                 height: 200.0,
               ),
               const SizedBox(height: 24),
-              const Text(
-                'Turn on Notifications ?',
+              Text(
+                AppLocalizations.of(context)!.turn_on_notifications,
                 textAlign: TextAlign.center,
-                style: TextStyle(
+                style: const TextStyle(
                   fontSize: 24,
                   fontWeight: FontWeight.bold,
                   color: Colors.black,
                 ),
               ),
               const SizedBox(height: 8),
-              const Text(
-                "Receive instant updates on live lectures, upcoming quizzes, and important announcements. Never miss a beat in your academic journey.",
+              Text(
+                AppLocalizations.of(context)!.notifications_description,
                 textAlign: TextAlign.center,
-                style: TextStyle(
+                style: const TextStyle(
                   fontSize: 16,
                   color: Colors.black54,
                 ),
@@ -49,16 +51,16 @@ class EnableNotificationscreen extends StatelessWidget {
                     borderRadius: BorderRadius.circular(15.0),
                   ),
                 ),
-                child: const Text(
-                  'Enable notifications',
-                  style: TextStyle(fontSize: 18),
+                child: Text(
+                  AppLocalizations.of(context)!.enable_notifications,
+                  style: const TextStyle(fontSize: 18),
                 ),
                 onPressed: () {},
               ),
               const SizedBox(height: 12),
               TextButton(
                 child: Text(
-                  'Skip',
+                  AppLocalizations.of(context)!.skip,
                   style: TextStyle(fontSize: 18, color: Colors.blue[900]),
                 ),
                 onPressed: () {},
diff --git a/lib/views/on_boarding_view/welcome_screen_view.dart b/lib/views/on_boarding_view/welcome_screen_view.dart
index 19ffa94a..bfb12ba9 100644
--- a/lib/views/on_boarding_view/welcome_screen_view.dart
+++ b/lib/views/on_boarding_view/welcome_screen_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/main.dart';
-import 'package:gocast_mobile/view_models/UserViewModel.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/constants.dart';
 import 'package:gocast_mobile/views/login_view/internal_login_view.dart';
-import 'package:gocast_mobile/views/utils/constants.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 /// Welcome screen view.
 /// This is the first screen that the user sees when the app is opened.
@@ -16,32 +16,74 @@ class WelcomeScreen extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    // Getting screen size for responsive layout
+    final screenSize = MediaQuery.of(context).size;
+    final bool isPortrait =
+        MediaQuery.of(context).orientation == Orientation.portrait;
+
     return Scaffold(
       body: SafeArea(
         child: Padding(
           padding: AppPadding.screenPadding,
+          child: isPortrait
+              ? _buildPortraitLayout(context, ref, screenSize)
+              : _buildLandscapeLayout(context, ref, screenSize),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPortraitLayout(
+    BuildContext context,
+    WidgetRef ref,
+    Size screenSize,
+  ) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: <Widget>[
+        const Spacer(),
+        _buildLogo(screenSize),
+        SizedBox(height: screenSize.height * 0.03),
+        _buildWelcomeText(context),
+        const SizedBox(height: 8),
+        _buildOverviewText(context),
+        const Spacer(),
+        _buildLoginButton(context, ref),
+        const SizedBox(height: 12),
+        _buildContinueWithoutButton(context),
+        const SizedBox(height: 12),
+        _buildInternalAccountLink(context),
+        SizedBox(height: screenSize.height * 0.06),
+      ],
+    );
+  }
+
+  Widget _buildLandscapeLayout(
+    BuildContext context,
+    WidgetRef ref,
+    Size screenSize,
+  ) {
+    return SingleChildScrollView(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(minHeight: screenSize.height),
+        child: IntrinsicHeight(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: <Widget>[
-              const Spacer(),
-              Image.asset(
-                'assets/images/streamicon.png',
-                width: 150.0,
-                height: 150.0,
-              ),
+              _buildLogo(screenSize),
               const SizedBox(height: 24),
-              _buildWelcomeText(),
+              _buildWelcomeText(context),
               const SizedBox(height: 8),
-              _buildOverviewText(),
+              _buildOverviewText(context),
               const SizedBox(height: 48),
-              const Spacer(),
               _buildLoginButton(context, ref),
               const SizedBox(height: 12),
               _buildContinueWithoutButton(context),
               const SizedBox(height: 12),
               _buildInternalAccountLink(context),
-              const Spacer(flex: 2),
+              const SizedBox(height: 48),
             ],
           ),
         ),
@@ -49,28 +91,41 @@ class WelcomeScreen extends ConsumerWidget {
     );
   }
 
-  Widget _buildWelcomeText() {
-    return const Text(
-      'Welcome to Gocast',
+  Widget _buildLogo(Size screenSize) {
+    return Center(
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(25),
+        child: Image.asset(
+          'assets/images/logo.png',
+          width: screenSize.width * 0.5, // Responsive width
+          height: screenSize.width * 0.5, // Responsive height
+        ),
+      ),
+    );
+  }
+
+  Widget _buildWelcomeText(BuildContext context) {
+    return Text(
+      AppLocalizations.of(context)!.welcome_to_gocast,
       textAlign: TextAlign.center,
-      style: TextStyle(
+      style: const TextStyle(
         fontSize: 24,
         fontWeight: FontWeight.bold,
-        color: Colors.black,
+        color: Color(0xFF0D47A1),
       ),
     );
   }
 
-  Widget _buildOverviewText() {
-    return const Text(
-      "Your Lectures on the Go",
+  Widget _buildOverviewText(BuildContext context) {
+    return Text(
+      AppLocalizations.of(context)!.your_lectures_on_the_go,
       textAlign: TextAlign.center,
-      style: TextStyle(fontSize: 16, color: Colors.black54),
+      style: const TextStyle(fontSize: 16, color: Colors.black54),
     );
   }
 
   Widget _buildLoginButton(BuildContext context, WidgetRef ref) {
-    final viewModel = ref.watch(userViewModelProvider.notifier);
+    final viewModel = ref.watch(userViewModelProvider);
     return ElevatedButton(
       style: ElevatedButton.styleFrom(
         foregroundColor: Colors.white,
@@ -81,7 +136,7 @@ class WelcomeScreen extends ConsumerWidget {
         shape:
             RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.0)),
       ),
-      child: viewModel.current.value.isLoading
+      child: viewModel.isLoading
           ? const SizedBox(
               width: 20.0,
               height: 20.0,
@@ -89,7 +144,7 @@ class WelcomeScreen extends ConsumerWidget {
                 valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
               ),
             )
-          : const Text('TUM Login', style: TextStyle(fontSize: 18)),
+          : Text(AppLocalizations.of(context)!.tum_login, style: const TextStyle(fontSize: 18)),
       onPressed: () => handleSSOLogin(context, ref),
     );
   }
@@ -105,10 +160,9 @@ class WelcomeScreen extends ConsumerWidget {
         shape:
             RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.0)),
       ),
-      child: const Text('Continue without', style: TextStyle(fontSize: 18)),
+      child: Text(AppLocalizations.of(context)!.continue_without, style: const TextStyle(fontSize: 18)),
       onPressed: () {
-        //TODO: Continue without login action
-        Navigator.pushNamed(context, '/courses');
+        Navigator.pushNamed(context, '/publiccourses');
       },
     );
   }
@@ -119,18 +173,26 @@ class WelcomeScreen extends ConsumerWidget {
         context,
         MaterialPageRoute(builder: (context) => const InternalLoginScreen()),
       ),
-      child: const Center(child: Text('Use an internal account')),
+      child:  Center(
+        child: Text(
+          AppLocalizations.of(context)!.use_an_internal_account,
+          style: const TextStyle(
+            decoration: TextDecoration.underline,
+            color: Colors.grey,
+            decorationColor: Colors.grey,
+          ),
+        ),
+      ),
     );
   }
 
   Future<void> handleSSOLogin(BuildContext context, WidgetRef ref) async {
-    // Call the SSO authentication function from /base/api/auth
-    await ref.read(userViewModel).ssoAuth(context, ref).then(
+    await ref.read(userViewModelProvider.notifier).ssoAuth(context, ref).then(
           (value) => {
-            if (ref.read(userViewModel).current.value.user != null)
+            if (ref.read(userViewModelProvider).user != null)
               {Navigator.pushNamed(context, '/courses')}
             else
-              {Navigator.pushNamed(context, '/home')},
+              {Navigator.pushNamed(context, '/welcome')},
           },
         );
   }
diff --git a/lib/views/settings_view/authentication_error_card_view.dart b/lib/views/settings_view/authentication_error_card_view.dart
new file mode 100644
index 00000000..420ca3b7
--- /dev/null
+++ b/lib/views/settings_view/authentication_error_card_view.dart
@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+Future<bool> showAuthenticationErrorCard(
+  BuildContext context,
+  WidgetRef ref,
+) async {
+  final userState = ref.read(userViewModelProvider);
+  bool isAuthenticated = userState.user != null;
+
+  if (!isAuthenticated) {
+    await showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12.0),
+          ),
+          backgroundColor: Theme.of(context).colorScheme.onPrimary,
+          title: Text(AppLocalizations.of(context)!.auth_required_title),
+          content: Text(AppLocalizations.of(context)!.auth_required_message),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('OK'),
+              onPressed: () => Navigator.of(context).pop(),
+            ),
+          ],
+        );
+      },
+    );
+  }
+  return isAuthenticated;
+}
diff --git a/lib/views/settings_view/custom_playback_speed_view.dart b/lib/views/settings_view/custom_playback_speed_view.dart
new file mode 100644
index 00000000..ce39776f
--- /dev/null
+++ b/lib/views/settings_view/custom_playback_speed_view.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+void showAddCustomSpeedDialog(
+  BuildContext context,
+  Function(double) onSpeedAdded,
+) {
+  double customSpeed = 1.0;
+  String errorMessage = '';
+
+  void validateAndSetSpeed(String value, BuildContext context) {
+    if (ModalRoute.of(context)?.isCurrent ?? false) {
+      errorMessage = '';
+
+      if (value.isEmpty) {
+        errorMessage = '';
+      } else {
+        double? parsedValue = double.tryParse(value);
+        if (parsedValue != null && parsedValue >= 0.25 && parsedValue <= 2.0) {
+          List<String> splitValue = value.split('.');
+          if ((splitValue[0].length > 1) ||
+              (splitValue.length > 1 && splitValue[1].length > 2)) {
+            errorMessage = AppLocalizations.of(context)!.number_too_long;
+          } else {
+            customSpeed = parsedValue;
+          }
+        } else {
+          errorMessage = AppLocalizations.of(context)!.enter_number_between;
+        }
+      }
+    }
+  }
+
+  showDialog(
+    context: context,
+    builder: (BuildContext context) {
+      return StatefulBuilder(
+        builder: (BuildContext context, StateSetter setState) {
+          return AlertDialog(
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(12.0),
+            ),
+            backgroundColor: Theme.of(context).colorScheme.onPrimary,
+            title: Text(AppLocalizations.of(context)!.add_custom_speed),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                TextField(
+                  decoration: InputDecoration(
+                    hintText: AppLocalizations.of(context)!.enter_speed,
+                    errorText: errorMessage.isNotEmpty ? errorMessage : null,
+                  ),
+                  keyboardType:
+                      const TextInputType.numberWithOptions(decimal: true),
+                  onChanged: (value) {
+                    setState(() {
+                      validateAndSetSpeed(value, context);
+                    });
+                  },
+                ),
+              ],
+            ),
+            actions: <Widget>[
+              TextButton(
+                child: Text(AppLocalizations.of(context)!.cancel),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              TextButton(
+                onPressed: errorMessage.isEmpty &&
+                        customSpeed >= 0.25 &&
+                        customSpeed <= 4.0
+                    ? () {
+                        Navigator.of(context).pop();
+                        onSpeedAdded(customSpeed);
+                      }
+                    : null,
+                child: Text(AppLocalizations.of(context)!.add),
+              ),
+            ],
+          );
+        },
+      );
+    },
+  );
+}
diff --git a/lib/views/settings_view/edit_profile_screen_view.dart b/lib/views/settings_view/edit_profile_screen_view.dart
new file mode 100644
index 00000000..91da3ef3
--- /dev/null
+++ b/lib/views/settings_view/edit_profile_screen_view.dart
@@ -0,0 +1,167 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class EditProfileScreen extends ConsumerStatefulWidget {
+  const EditProfileScreen({super.key});
+
+  @override
+  EditProfileScreenState createState() => EditProfileScreenState();
+}
+
+class EditProfileScreenState extends ConsumerState<EditProfileScreen> {
+  final TextEditingController preferredNameController = TextEditingController();
+  String infoText = '';
+  bool isError = false;
+
+  @override
+  void initState() {
+    super.initState();
+    preferredNameController.addListener(_updateCharacterCount);
+  }
+
+  @override
+  void dispose() {
+    preferredNameController.removeListener(_updateCharacterCount);
+    preferredNameController.dispose();
+    super.dispose();
+  }
+
+  void _updateCharacterCount() {
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    bool isLandscape =
+        MediaQuery.of(context).orientation == Orientation.landscape;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Padding(
+          padding:
+              isLandscape ? const EdgeInsets.only(top: 16.0) : EdgeInsets.zero,
+          child:  Text(AppLocalizations.of(context)!.edit_profile),
+        ),
+      ),
+      body: Padding(
+        padding: isLandscape
+            ? const EdgeInsets.only(left: 25, right: 55)
+            : EdgeInsets.zero,
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+               Text(
+                AppLocalizations.of(context)!.preferred_name,
+                style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+              ),
+              const SizedBox(height: 8),
+              TextField(
+                controller: preferredNameController,
+                maxLength: 50,
+                decoration: InputDecoration(
+                  hintText: AppLocalizations.of(context)!.enter_preferred_name,
+                  border: const OutlineInputBorder(),
+                  counterText: '${preferredNameController.text.length}/80',
+                ),
+              ),
+              const SizedBox(height: 16),
+              RichText(
+                text: TextSpan(
+                  style: TextStyle(
+                    color:
+                        Theme.of(context).colorScheme.scrim.withOpacity(0.50),
+                  ),
+                  children:  [
+                    TextSpan(
+                      text: AppLocalizations.of(context)!.name_change_limitation,
+                      style: const TextStyle(
+                        fontStyle: FontStyle.italic,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 16),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(8.0),
+                  ),
+                ),
+                onPressed: () => _onSaveButtonPressed(context),
+                child:  Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 12),
+                  child: Text(AppLocalizations.of(context)!.save),
+                ),
+              ),
+              const SizedBox(height: 16),
+              Text(
+                infoText,
+                style: TextStyle(
+                  color: isError
+                      ? Theme.of(context).colorScheme.error
+                      : Theme.of(context).colorScheme.secondary,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _onSaveButtonPressed(BuildContext context) {
+    if (mounted) {
+      if (preferredNameController.text.trim().isNotEmpty) {
+        _updatePreferredName(preferredNameController.text);
+      } else {
+        _showErrorDialog(AppLocalizations.of(context)!.enter_preferred_name);
+      }
+    }
+  }
+
+  Future<void> _updatePreferredName(String name) async {
+    try {
+      bool success = await ref
+          .read(settingViewModelProvider.notifier)
+          .updatePreferredName(name);
+      if (success) {
+        setState(() {
+          infoText = AppLocalizations.of(context)!.preferred_name_saved(name);
+          isError = false;
+        });
+      } else {
+        _showErrorDialog('3 months');
+      }
+    } catch (e) {
+      _showErrorDialog('An error occurred');
+    }
+  }
+
+  void _showErrorDialog(String errorMessage) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          backgroundColor: Theme.of(context).colorScheme.onPrimary,
+          title: const Text("Error"),
+          content: Text(errorMessage== '3 months' ? AppLocalizations.of(context)!.name_change_limitation : errorMessage),
+          actions: <Widget>[
+            TextButton(
+              child: const Text("OK"),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/lib/views/settings_view/playback_speed_picker_view.dart b/lib/views/settings_view/playback_speed_picker_view.dart
new file mode 100644
index 00000000..b13e0f82
--- /dev/null
+++ b/lib/views/settings_view/playback_speed_picker_view.dart
@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+void showPlaybackSpeedsPicker(
+  BuildContext context,
+  WidgetRef ref,
+  List<double> selectedSpeeds,
+  Function(double, bool) updateSelectedSpeeds,
+) {
+  List<double> defaultSpeeds = List.generate(8, (index) => (index + 1) * 0.25);
+
+  if (!selectedSpeeds.contains(1.0)) {
+    selectedSpeeds.add(1.0);
+  }
+
+  showModalBottomSheet(
+    context: context,
+    builder: (BuildContext context) {
+      return StatefulBuilder(
+        builder: (BuildContext context, StateSetter setModalState) {
+          return Padding(
+            padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 0),
+            child: Column(
+              children: [
+                Expanded(
+                  child: ListView(
+                    children: [
+                      for (var speed in defaultSpeeds)
+                        _buildSpeedTile(
+                          speed: speed,
+                          isSelected: selectedSpeeds.contains(speed),
+                          onTap: (double speed, bool isSelected) {
+                            if (speed != 1.0) {
+                              setModalState(() {
+                                isSelected
+                                    ? selectedSpeeds.add(speed)
+                                    : selectedSpeeds.remove(speed);
+                                updateSelectedSpeeds(speed, isSelected);
+                              });
+                            }
+                          },
+                        ),
+                      if (selectedSpeeds
+                          .any((speed) => !defaultSpeeds.contains(speed))) ...[
+                        const Divider(),
+                         Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Text(
+                            AppLocalizations.of(context)!.custom_playback_speed,
+                            style: const TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                        ),
+                        for (var speed in selectedSpeeds
+                            .where((speed) => !defaultSpeeds.contains(speed)))
+                          _buildSpeedTile(
+                            speed: speed,
+                            isSelected: true,
+                            onTap: (double speed, bool isSelected) {
+                              setModalState(() {
+                                isSelected
+                                    ? selectedSpeeds.add(speed)
+                                    : selectedSpeeds.remove(speed);
+                                updateSelectedSpeeds(speed, isSelected);
+                              });
+                            },
+                          ),
+                      ],
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      );
+    },
+  );
+}
+
+Widget _buildSpeedTile({
+  required double speed,
+  required bool isSelected,
+  required Function(double, bool) onTap,
+}) {
+  bool isNonRemovable = speed == 1.0;
+
+  return Opacity(
+    opacity: isNonRemovable ? 0.6 : 1.0,
+    child: ListTile(
+      title: Text('${speed}x'),
+      trailing: isSelected ? const Icon(Icons.check) : const SizedBox(),
+      onTap: isNonRemovable ? null : () => onTap(speed, !isSelected),
+    ),
+  );
+}
diff --git a/lib/views/settings_view/playback_speed_settings_view.dart b/lib/views/settings_view/playback_speed_settings_view.dart
new file mode 100644
index 00000000..5a96a4ac
--- /dev/null
+++ b/lib/views/settings_view/playback_speed_settings_view.dart
@@ -0,0 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/views/settings_view/playback_speed_picker_view.dart';
+import 'package:gocast_mobile/views/settings_view/custom_playback_speed_view.dart';
+import 'package:gocast_mobile/views/settings_view/authentication_error_card_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class PlaybackSpeedSettings extends ConsumerWidget {
+  const PlaybackSpeedSettings({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final settingState = ref.watch(settingViewModelProvider);
+    final selectedPlaybackSpeeds =
+        _parsePlaybackSpeeds(settingState.userSettings, ref);
+
+    return Column(
+      children: [
+        _buildPlaybackSpeedsTile(context, ref, selectedPlaybackSpeeds),
+        _buildCustomPlaybackSpeedsTile(context, ref),
+      ],
+    );
+  }
+
+  ListTile _buildPlaybackSpeedsTile(
+    BuildContext context,
+    WidgetRef ref,
+    List<double> playbackSpeeds,
+  ) {
+    return ListTile(
+      title:  Text(AppLocalizations.of(context)!.playback_speed),
+      trailing: const Icon(Icons.arrow_forward_ios),
+      onTap: () => showPlaybackSpeedsPicker(
+        context,
+        ref,
+        playbackSpeeds,
+        (double speed, bool isSelected) {
+          _updateSelectedSpeeds(context, ref, speed, isSelected);
+        },
+      ),
+    );
+  }
+
+  ListTile _buildCustomPlaybackSpeedsTile(BuildContext context, WidgetRef ref) {
+    return ListTile(
+      title: Text(AppLocalizations.of(context)!.add_custom_playback_speed),
+      onTap: () {
+        showAddCustomSpeedDialog(context, (double customSpeed) {
+          _updateSelectedSpeeds(context, ref, customSpeed, true);
+        });
+      },
+    );
+  }
+
+  void _updateSelectedSpeeds(
+    BuildContext context,
+    WidgetRef ref,
+    double speed,
+    bool isSelected,
+  ) async {
+    bool isAuthenticated = await showAuthenticationErrorCard(context, ref);
+    if (!isAuthenticated) return;
+
+    await ref
+        .read(settingViewModelProvider.notifier)
+        .updateSelectedSpeeds(speed, isSelected);
+  }
+
+  List<double> _parsePlaybackSpeeds(
+    List<UserSetting>? userSettings,
+    WidgetRef ref,
+  ) {
+    return ref.read(settingViewModelProvider.notifier).parsePlaybackSpeeds();
+  }
+}
diff --git a/lib/views/settings_view/preferred_greeting_view.dart b/lib/views/settings_view/preferred_greeting_view.dart
new file mode 100644
index 00000000..2c67a654
--- /dev/null
+++ b/lib/views/settings_view/preferred_greeting_view.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/views/settings_view/authentication_error_card_view.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class PreferredGreetingView extends ConsumerWidget {
+  const PreferredGreetingView({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final settingState = ref.watch(settingViewModelProvider);
+    final currentGreeting = settingState.userSettings
+            ?.firstWhere(
+              (setting) => setting.type == UserSettingType.GREETING,
+              orElse: () => UserSetting(value: 'Default Greeting'),
+            )
+            .value ??
+        'Default Greeting';
+
+    return ListTile(
+      title: Text(AppLocalizations.of(context)!.preferred_greeting),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          _buildGreetingRadioOption(context, ref, 'Servus', currentGreeting),
+          _buildGreetingRadioOption(context, ref, 'Moin', currentGreeting),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildGreetingRadioOption(
+    BuildContext context,
+    WidgetRef ref,
+    String greeting,
+    String currentGreeting,
+  ) {
+    bool isSelected = greeting == currentGreeting;
+
+    return Row(
+      children: [
+        Radio<String>(
+          value: greeting,
+          groupValue: currentGreeting,
+          onChanged: (String? newValue) async {
+            if (newValue != null) {
+              bool isAuthenticated =
+                  await showAuthenticationErrorCard(context, ref);
+              if (isAuthenticated) {
+                await ref
+                    .read(settingViewModelProvider.notifier)
+                    .updatePreferredGreeting(newValue);
+              }
+            }
+          },
+        ),
+        Text(
+          greeting,
+          style: TextStyle(
+            fontSize: isSelected ? 15 : 13,
+            fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
+            color: isSelected ? Theme.of(context).colorScheme.primary : null,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/views/settings_view/settings_screen_view.dart b/lib/views/settings_view/settings_screen_view.dart
index e439ec3d..37491cc1 100644
--- a/lib/views/settings_view/settings_screen_view.dart
+++ b/lib/views/settings_view/settings_screen_view.dart
@@ -1,7 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/main.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/utils/UserPreferences.dart';
 import 'package:gocast_mobile/views/on_boarding_view/welcome_screen_view.dart';
+import 'package:gocast_mobile/views/settings_view/playback_speed_settings_view.dart';
+import 'package:gocast_mobile/views/settings_view/preferred_greeting_view.dart';
+import 'package:gocast_mobile/views/settings_view/edit_profile_screen_view.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/views/settings_view/authentication_error_card_view.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
 
 class SettingsScreen extends ConsumerStatefulWidget {
   const SettingsScreen({super.key});
@@ -10,82 +19,228 @@ class SettingsScreen extends ConsumerStatefulWidget {
   ConsumerState<ConsumerStatefulWidget> createState() => _SettingsScreenState();
 }
 
+bool _isTablet(BuildContext context) {
+  return MediaQuery.of(context).size.width >= 600;
+}
+
 class _SettingsScreenState extends ConsumerState<SettingsScreen> {
-  bool isDarkMode = false;
-  bool isPushNotificationsEnabled = false;
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
+
+  @override
+  void initState() {
+    super.initState();
+    Future.microtask(
+      () => ref.read(settingViewModelProvider.notifier).fetchUserSettings(),
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
+    final userState = ref.watch(userViewModelProvider);
+    final settingState = ref.watch(settingViewModelProvider);
+
     return Scaffold(
+      key: _scaffoldKey,
       appBar: _buildAppBar(context),
-      body: ListView(
-        children: [
-          _buildProfileTile(),
-          const Divider(),
-          _buildSectionTitle('Account Settings'),
-          _buildEditableListTile('Edit profile', () {
-            // TODO: Navigate to edit profile screen
-          }),
-          _buildSwitchListTile(
-            title: 'Push notifications',
-            value: isPushNotificationsEnabled,
-            onChanged: (value) =>
-                setState(() => isPushNotificationsEnabled = value),
-          ),
-          _buildSwitchListTile(
-            title: 'Dark mode',
-            value: isDarkMode,
-            onChanged: (value) => setState(() => isDarkMode = value),
-          ),
-          _buildLogoutTile(context),
-          const Divider(),
-          _buildSectionTitle('More'),
-          _buildNavigableListTile('About us', () {
-            // TODO: Navigate to about us screen
-          }),
-          _buildNavigableListTile('Privacy policy', () {
-            // TODO: Navigate to privacy policy screen
-          }),
-          _buildNavigableListTile('Terms and conditions', () {
-            // TODO: Navigate to terms and conditions screen
-          }),
-        ],
+      body: Consumer(
+        builder: (context, watch, _) {
+          return ListView(
+            children: [
+              _buildProfileTile(userState),
+              const Divider(),
+              _buildSectionTitle(AppLocalizations.of(context)!.account_settings),
+              _buildEditableListTile(AppLocalizations.of(context)!.edit_profile, () async {
+                bool isAuthenticated =
+                    await showAuthenticationErrorCard(context, ref);
+                if (isAuthenticated && mounted) {
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => const EditProfileScreen(),
+                    ),
+                  );
+                }
+              }),
+              const PreferredGreetingView(),
+              _buildSwitchListTile(
+                title: AppLocalizations.of(context)!.push_notifications,
+                value: settingState.isPushNotificationsEnabled,
+                onChanged: (value) {
+                  ref
+                      .read(settingViewModelProvider.notifier)
+                      .saveNotificationPreference(value);
+                },
+                ref: ref,
+              ),
+              _buildThemeSelectionTile(context, ref),
+              _buildLanguageSelectionTile(context, ref),
+              _buildSwitchListTile(
+                title: AppLocalizations.of(context)!.download_over_wifi_only,
+                value: settingState.isDownloadWithWifiOnly,
+                onChanged: (value) {
+                  ref
+                      .read(settingViewModelProvider.notifier)
+                      .saveDownloadWifiOnlyPreference(value);
+                },
+                ref: ref,
+              ),
+              _buildSectionTitle(AppLocalizations.of(context)!.playback_speed),
+              const PlaybackSpeedSettings(),
+              _buildLogoutTile(context),
+              const Divider(),
+              _buildSectionTitle(AppLocalizations.of(context)!.more),
+              _buildNavigableListTile(AppLocalizations.of(context)!.about_us, ""),
+              _buildNavigableListTile(
+                AppLocalizations.of(context)!.privacy_policy,
+                "https://live.rbg.tum.de/privacy",
+              ),
+              _buildNavigableListTile(
+                AppLocalizations.of(context)!.terms_and_conditions,
+                "https://live.rbg.tum.de/imprint",
+              ),
+            ],
+          );
+        },
       ),
     );
   }
 
   AppBar _buildAppBar(BuildContext context) {
     return AppBar(
-      title: const Text('Settings'),
+      title: Text(AppLocalizations.of(context)!.settings),
       leading: IconButton(
-        icon: const Icon(Icons.arrow_back),
+        icon: !_isTablet(context)
+            ? const Icon(Icons.arrow_back_ios)
+            : const Icon(Icons.close),
         onPressed: () => Navigator.pop(context),
       ),
     );
   }
 
-  ListTile _buildProfileTile() {
+  ListTile _buildThemeSelectionTile(BuildContext context, WidgetRef ref) {
+    // Get the current theme setting from the state
+    final settingState = ref.watch(settingViewModelProvider);
+
+    String themeModeText;
+    if (settingState.isDarkMode) {
+      themeModeText = AppLocalizations.of(context)!.dark;
+    } else if (settingState.isLightMode) {
+      themeModeText = AppLocalizations.of(context)!.light;
+    } else {
+      themeModeText = AppLocalizations.of(context)!.system_default;
+    }
+    return ListTile(
+      title:  Text(AppLocalizations.of(context)!.choose_theme),
+      subtitle: Text(themeModeText),
+      trailing: const Icon(Icons.arrow_forward_ios),
+      onTap: () => _showThemeSelectionSheet(context, ref),
+    );
+  }
+
+  ListTile _buildLanguageSelectionTile(BuildContext context, WidgetRef ref) {
+    return ListTile(
+      title: Text(AppLocalizations.of(context)!.language_selection),
+      subtitle: Text(UserPreferences.getLanguageName(UserPreferences.getLanguage())),
+      trailing: const Icon(Icons.arrow_forward_ios),
+      onTap: () async {
+        final selectedLanguage = await showModalBottomSheet<String>(
+          context: context,
+          builder: (BuildContext context) {
+            return SafeArea(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <String>['en', 'fr', 'de', 'es']
+                    .map((String lang) => ListTile(
+                  title: Text(UserPreferences.getLanguageName(lang)),
+                  onTap: () => Navigator.pop(context, lang),
+                ),)
+                    .toList(),
+              ),
+            );
+          },
+        );
+
+        if (selectedLanguage != null) {
+          await UserPreferences.setLanguage(selectedLanguage);
+          // To rebuild the app
+          ref.read(settingViewModelProvider.notifier).setLoading(false);
+        }
+      },
+    );
+  }
+
+
+  void _showThemeSelectionSheet(BuildContext context, WidgetRef ref) {
+    showModalBottomSheet(
+      context: context,
+      builder: (BuildContext context) {
+        return SafeArea(
+          child: Wrap(
+            children: <Widget>[
+              ListTile(
+                title:  Text(AppLocalizations.of(context)!.system_default),
+                onTap: () {
+                  ref
+                      .read(settingViewModelProvider.notifier)
+                      .saveThemePreference('system', ref);
+                  Navigator.pop(context);
+                },
+              ),
+              ListTile(
+                title: Text(AppLocalizations.of(context)!.dark),
+                onTap: () {
+                  ref
+                      .read(settingViewModelProvider.notifier)
+                      .saveThemePreference('dark', ref);
+                  Navigator.pop(context);
+                },
+              ),
+              ListTile(
+                title: Text(AppLocalizations.of(context)!.light),
+                onTap: () {
+                  ref
+                      .read(settingViewModelProvider.notifier)
+                      .saveThemePreference('light', ref);
+                  Navigator.pop(context);
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  ListTile _buildProfileTile(userState) {
+    final settingState = ref.watch(settingViewModelProvider);
+    final preferredNameSetting = settingState.userSettings?.firstWhere(
+      (setting) => setting.type == UserSettingType.PREFERRED_NAME,
+      orElse: () => UserSetting(value: ''),
+    );
+    final preferredName = preferredNameSetting?.value ?? '';
+    final userName = userState.user?.name ?? 'Guest';
+
+    final greetingSetting = settingState.userSettings?.firstWhere(
+      (setting) => setting.type == UserSettingType.GREETING,
+      orElse: () => UserSetting(value: 'Hi'),
+    );
+
+    final preferredGreeting = greetingSetting?.value ?? 'Hi';
+    String displayName = preferredName.isNotEmpty ? preferredName : userName;
+
     return ListTile(
       leading: const CircleAvatar(
         backgroundImage: AssetImage('assets/images/profile_temp.png'),
       ),
-      title: Text(ref.read(userViewModel).current.value.user?.name ?? 'Guest'),
-      onTap: () {
-        // TODO: Navigate to profile edit screen
-      },
+      title: Text('$preferredGreeting, $displayName'),
     );
   }
 
-  Padding _buildSectionTitle(String title) {
+  Widget _buildSectionTitle(String title) {
     return Padding(
-      padding: const EdgeInsets.all(16.0),
+      padding: const EdgeInsets.all(8.0),
       child: Text(
         title,
-        style: const TextStyle(
-          fontSize: 18,
-          fontWeight: FontWeight.bold,
-          color: Colors.black,
-        ),
+        style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
       ),
     );
   }
@@ -102,13 +257,14 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
     required String title,
     required bool value,
     required ValueChanged<bool> onChanged,
+    required WidgetRef ref,
   }) {
     return ListTile(
       title: Text(title),
       trailing: Switch(
         value: value,
         onChanged: onChanged,
-        inactiveTrackColor: Colors.grey,
+        inactiveTrackColor: Theme.of(context).colorScheme.background,
       ),
       onTap: () => onChanged(!value),
     );
@@ -116,22 +272,66 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
 
   ListTile _buildLogoutTile(BuildContext context) {
     return ListTile(
-      title: const Text('Log out'),
-      onTap: () {
-        ref.read(userViewModel).logout();
-        Navigator.of(context).pushAndRemoveUntil(
-          MaterialPageRoute(builder: (context) => const WelcomeScreen()),
-          (Route<dynamic> route) => false,
+      title: Text(
+        AppLocalizations.of(context)!.logout,
+        style: TextStyle(color: Theme.of(context).colorScheme.error),
+      ),
+      onTap: () => _showLogoutDialog(context),
+    );
+  }
+
+  void _showLogoutDialog(BuildContext context) async {
+    // Capture the Navigator state before the async gap
+    final NavigatorState navigator = Navigator.of(context);
+
+    final result = await showDialog<bool>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title:  Text(AppLocalizations.of(context)!.logout),
+          content: Text(AppLocalizations.of(context)!.logout_message),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(false),
+              // User chooses not to delete downloads
+              child: Text(AppLocalizations.of(context)!.no),
+            ),
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(true),
+              // User chooses to delete downloads
+              child: Text(AppLocalizations.of(context)!.yes),
+            ),
+          ],
         );
       },
     );
+    if (!mounted) return;
+    if (result == true) {
+      // User decided to delete all downloads
+      await ref.read(downloadViewModelProvider.notifier).deleteAllDownloads();
+    }
+    // Proceed with logout
+    ref.read(userViewModelProvider.notifier).logout();
+    // Use the captured Navigator state
+    navigator.pushAndRemoveUntil(
+      MaterialPageRoute(builder: (context) => const WelcomeScreen()),
+      (Route<dynamic> route) => false,
+    );
   }
 
-  ListTile _buildNavigableListTile(String title, VoidCallback onTap) {
+  ListTile _buildNavigableListTile(String title, String redirectTo) {
+    final Uri url = Uri.parse(redirectTo);
+
     return ListTile(
       title: Text(title),
       trailing: const Icon(Icons.arrow_forward_ios),
-      onTap: onTap,
+      onTap: () async {
+        if (await canLaunchUrl(url)) {
+          await launchUrl(url);
+        } else {
+          throw 'Could not launch $url';
+        }
+      },
     );
   }
 }
diff --git a/lib/views/utils/theme.dart b/lib/views/utils/theme.dart
deleted file mode 100644
index 37d0a431..00000000
--- a/lib/views/utils/theme.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-import 'package:flutter/material.dart';
-
-// Define a class for custom colors used throughout the app
-class AppColors {
-  static const Color primaryColor =
-      Color(0xFF0D47A1); // ARGB value of Colors.blue[900]
-  static const Color primaryTextColor = Colors.black;
-  static const Color secondaryTextColor = Colors.black54;
-  static const Color appBarBackgroundColor = Colors.white;
-  static const Color appBarIconColor = Colors.black;
-  static const Color appBarTextColor = Colors.black;
-  static const Color sectionTitleColor = Colors.black;
-  static const Color indicatorActiveColor = Colors.blue;
-  static const Color linkTextColor = Colors.blue;
-  static const Color inactiveColor = Colors.grey;
-}
-
-// Define a class for custom text styles
-class AppTextStyles {
-  static const TextStyle sectionTitle = TextStyle(
-    fontSize: 22,
-    fontWeight: FontWeight.bold,
-    color: AppColors.sectionTitleColor,
-  );
-
-  static const TextStyle heading = TextStyle(
-    fontSize: 24,
-    fontWeight: FontWeight.bold,
-    color: AppColors.primaryTextColor,
-  );
-
-  static const TextStyle body = TextStyle(
-    fontSize: 16,
-    color: AppColors.secondaryTextColor,
-  );
-
-  static const TextStyle link = TextStyle(
-    decoration: TextDecoration.underline,
-    fontSize: 16,
-    color: AppColors.linkTextColor,
-  );
-}
-
-// Define the app's theme data
-final ThemeData appTheme = ThemeData(
-  primaryColor: AppColors.primaryColor,
-  scaffoldBackgroundColor: AppColors.appBarBackgroundColor,
-  colorScheme: ColorScheme.fromSwatch().copyWith(
-    primary: AppColors.primaryColor,
-    secondary: AppColors.indicatorActiveColor,
-  ),
-  appBarTheme: const AppBarTheme(
-    color: AppColors.appBarBackgroundColor,
-    iconTheme: IconThemeData(color: AppColors.appBarIconColor),
-    titleTextStyle: TextStyle(
-      color: AppColors.appBarTextColor,
-      fontSize: 20,
-      fontWeight: FontWeight.bold,
-    ),
-  ),
-  textTheme: const TextTheme(
-    titleMedium: AppTextStyles.sectionTitle,
-    displayLarge: AppTextStyles.heading,
-    bodyLarge: AppTextStyles.body,
-    titleSmall: AppTextStyles.link,
-  ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: AppColors.primaryColor,
-    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
-    textTheme: ButtonTextTheme.primary,
-  ),
-  inputDecorationTheme: InputDecorationTheme(
-    border: OutlineInputBorder(borderRadius: BorderRadius.circular(8.0)),
-    hintStyle: const TextStyle(
-      color: Colors.grey,
-      fontSize: 14,
-      fontWeight: FontWeight.w500,
-    ),
-    enabledBorder: const OutlineInputBorder(
-      borderSide: BorderSide(color: Colors.grey, width: 1.0),
-    ),
-    focusedBorder: const OutlineInputBorder(
-      borderSide: BorderSide(color: AppColors.primaryColor, width: 2.0),
-    ),
-  ),
-);
diff --git a/lib/views/video_view/offline_video_player/offline_video_player.dart b/lib/views/video_view/offline_video_player/offline_video_player.dart
new file mode 100644
index 00000000..bc1c477b
--- /dev/null
+++ b/lib/views/video_view/offline_video_player/offline_video_player.dart
@@ -0,0 +1,162 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/chat_view/inactive_view.dart';
+import 'package:gocast_mobile/views/video_view/offline_video_player/offline_video_player_controller.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class OfflineVideoPlayerPage extends ConsumerStatefulWidget {
+  final String localPath;
+
+  const OfflineVideoPlayerPage({
+    super.key,
+    required this.localPath,
+  });
+
+  @override
+  ConsumerState<OfflineVideoPlayerPage> createState() =>
+      OfflineVideoPlayerPageState();
+}
+
+class OfflineVideoPlayerPageState
+    extends ConsumerState<OfflineVideoPlayerPage> {
+  late OfflineVideoPlayerControllerManager _controllerManager;
+
+  Timer? _progressTimer;
+
+  Widget _buildVideoLayout() {
+    return Column(
+      children: <Widget>[
+        Expanded(child: _controllerManager.buildVideoPlayer()),
+        const Expanded(child: InactiveView()),
+      ],
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _initializeControllerManager();
+    Future.microtask(() {
+      _initVideoPlayer();
+      _setupProgressListener();
+    });
+  }
+
+  @override
+  void dispose() {
+    _controllerManager.dispose();
+    _progressTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text("Replace me with video Title")),
+      body: ref.read(videoViewModelProvider).isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : _buildVideoLayout(),
+    );
+  }
+
+// Initialize the video player.
+  Future<void> _initVideoPlayer() async {
+    await _initializeAndSeekPlayer();
+  }
+
+// Initialize the controller manager.
+  void _initializeControllerManager() {
+    _controllerManager =
+        OfflineVideoPlayerControllerManager(localPath: widget.localPath);
+  }
+
+// Initialize the video player and seek to the last progress.
+  Future<void> _initializeAndSeekPlayer() async {
+    if (!mounted) return;
+    try {
+      await _controllerManager.initializePlayer();
+      _setLoadingState(false);
+      await _seekToLastProgress();
+    } catch (error) {
+      _handleError(error, 'Failed to initialize video player');
+    }
+  }
+
+// Seek to the last progress.
+  Future<void> _seekToLastProgress() async {
+    final prefs = await SharedPreferences.getInstance();
+    final progress = prefs.getDouble('progress_${widget.localPath}') ?? 0.0;
+    final position = Duration(
+      seconds: (progress *
+              _controllerManager.videoPlayerController.value.duration.inSeconds)
+          .round(),
+    );
+    await _controllerManager.videoPlayerController.seekTo(position);
+  }
+
+// Handle errors and update the UI accordingly.
+  void _handleError(Object error, String errorMessage) {
+    if (mounted) {
+      ref
+          .read(videoViewModelProvider)
+          .copyWith(error: AppError(errorMessage, error));
+      _setLoadingState(false);
+    }
+  }
+
+  void _setupProgressListener() {
+    _progressTimer =
+        Timer.periodic(const Duration(seconds: 5), _progressUpdateCallback);
+  }
+
+  void _progressUpdateCallback(Timer timer) async {
+    if (!_isPlayerInitialized()) return;
+    if (_controllerManager.videoPlayerController.value.isPlaying) {
+      final position = _getCurrentPosition();
+      final progress = _calculateProgress(position);
+      await _updateProgress(progress);
+      if (_shouldMarkAsWatched(progress)) {
+        await _markStreamAsWatched();
+      }
+    }
+  }
+
+  bool _isPlayerInitialized() {
+    return _controllerManager.videoPlayerController.value.isInitialized;
+  }
+
+  Duration _getCurrentPosition() {
+    return _controllerManager.videoPlayerController.value.position;
+  }
+
+  double _calculateProgress(Duration position) {
+    final duration = _controllerManager.videoPlayerController.value.duration;
+    return position.inSeconds / duration.inSeconds;
+  }
+
+  Future<void> _updateProgress(double progress) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setDouble('progress_${widget.localPath}', progress);
+  }
+
+  bool _shouldMarkAsWatched(double progress) {
+    const watchedThreshold = 0.9; // 90%
+    return progress >= watchedThreshold;
+  }
+
+  Future<void> _markStreamAsWatched() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('watched_${widget.localPath}', true);
+  }
+
+  // Simplified loading state management
+  void _setLoadingState(bool isLoading) {
+    setState(() {
+      ref.read(videoViewModelProvider).copyWith(isLoading: isLoading);
+    });
+  }
+}
diff --git a/lib/views/video_view/offline_video_player/offline_video_player_controller.dart b/lib/views/video_view/offline_video_player/offline_video_player_controller.dart
new file mode 100644
index 00000000..26182257
--- /dev/null
+++ b/lib/views/video_view/offline_video_player/offline_video_player_controller.dart
@@ -0,0 +1,81 @@
+import 'dart:io';
+
+import 'package:chewie/chewie.dart';
+
+import 'package:flutter/material.dart';
+import 'package:video_player/video_player.dart';
+
+class OfflineVideoPlayerControllerManager {
+  late VideoPlayerController videoPlayerController;
+  ChewieController? chewieController;
+  final String localPath;
+
+  OfflineVideoPlayerControllerManager({
+    required this.localPath,
+  }) {
+    videoPlayerController = _createVideoPlayerController(localPath);
+  }
+
+  VideoPlayerController _createVideoPlayerController(String source) {
+    return VideoPlayerController.file(
+      File(source),
+    );
+  }
+
+  Future<void> initializePlayer() async {
+    final file = File(localPath);
+    if (!await file.exists()) {
+      // Handle the case where the video file doesn't exist
+      //print('Video file does not exist at path: $localPath');
+      return;
+    }
+    //print('Video file  exist at path: $localPath');
+
+    videoPlayerController = _createVideoPlayerController(localPath);
+    await videoPlayerController.initialize();
+    chewieController = _createChewieController();
+  }
+
+  ChewieController _createChewieController() {
+    return ChewieController(
+      videoPlayerController: videoPlayerController,
+      aspectRatio: videoPlayerController.value.aspectRatio,
+      autoPlay: false,
+      looping: false,
+      cupertinoProgressColors: _getCupertinoProgressColors(),
+      materialProgressColors: _getMaterialProgressColors(),
+      placeholder: Container(color: Colors.black),
+      autoInitialize: true,
+      allowFullScreen: true,
+      fullScreenByDefault: false,
+      showOptions: true,
+    );
+  }
+
+  ChewieProgressColors _getCupertinoProgressColors() {
+    return ChewieProgressColors(
+      playedColor: Colors.blue,
+      handleColor: Colors.blueAccent,
+      backgroundColor: Colors.grey,
+      bufferedColor: Colors.lightBlueAccent,
+    );
+  }
+
+  ChewieProgressColors _getMaterialProgressColors() {
+    return ChewieProgressColors(
+      playedColor: Colors.blue,
+      handleColor: Colors.blueAccent,
+      backgroundColor: Colors.grey,
+      bufferedColor: Colors.lightBlueAccent,
+    );
+  }
+
+  Widget buildVideoPlayer() => chewieController == null
+      ? const Center(child: CircularProgressIndicator())
+      : Chewie(controller: chewieController!);
+
+  void dispose() {
+    videoPlayerController.dispose();
+    chewieController?.dispose();
+  }
+}
diff --git a/lib/views/video_view/utils/custom_video_control_bar.dart b/lib/views/video_view/utils/custom_video_control_bar.dart
new file mode 100644
index 00000000..6b9f2369
--- /dev/null
+++ b/lib/views/video_view/utils/custom_video_control_bar.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class CustomVideoControlBar extends StatelessWidget {
+  final VoidCallback onToggleChat;
+  final Function(String) onDownload;
+  final VoidCallback onOpenPolls;
+  final Stream currentStream;
+  final bool isChatVisible;
+  final bool isChatActive;
+  final bool isPollVisible;
+  final bool isPollActive;
+
+  const CustomVideoControlBar({
+    super.key,
+    required this.onToggleChat,
+    required this.onOpenPolls,
+    required this.currentStream,
+    this.isChatActive = false,
+    this.isChatVisible = false,
+    this.isPollActive = false,
+    this.isPollVisible = false,
+    required this.onDownload,
+  });
+
+  void _showDownloadOptions(BuildContext context) {
+    showModalBottomSheet(
+      context: context,
+      builder: (BuildContext context) {
+        return SafeArea(
+          child: Wrap(
+            children: <Widget>[
+              ListTile(
+                leading: const Icon(Icons.download),
+                title: const Text('Combined'),
+                onTap: () {
+                  Navigator.pop(context);
+                  onDownload('Combined');
+                },
+              ),
+              ListTile(
+                leading: const Icon(Icons.present_to_all),
+                title: const Text('Presentation Only'),
+                onTap: () {
+                  Navigator.pop(context);
+                  onDownload('Presentation');
+                },
+              ),
+              ListTile(
+                leading: const Icon(Icons.videocam),
+                title: const Text('Camera'),
+                onTap: () {
+                  Navigator.pop(context);
+                  onDownload('Camera Only');
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData themeData = Theme.of(context);
+
+    List<Map<String, IconData>> getMenuItems(bool isPinned, bool isDownloaded) {
+      List<Map<String, IconData>> items = [
+        {'Pin Course': isPinned ? Icons.push_pin : Icons.push_pin_outlined},
+        {
+          'Download': isDownloaded
+              ? Icons.download_done_outlined
+              : Icons.download_outlined,
+        },
+      ];
+      return items;
+    }
+
+    return Consumer(
+      builder: (context, ref, child) {
+        final pinnedViewModel = ref.read(pinnedCourseViewModelProvider.notifier);
+        final downloadViewModel = ref.read(downloadViewModelProvider.notifier);
+        final isPinned = pinnedViewModel.isCoursePinned(currentStream.courseID);
+        final isDownloaded =
+            downloadViewModel.isStreamDownloaded(currentStream.id);
+
+        return Container(
+          padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Row(
+                children: [
+                  IconButton(
+                    icon: isChatVisible
+                        ? Icon(Icons.chat_bubble, color: themeData.primaryColor)
+                        : const Icon(Icons.chat_bubble_outline),
+                    color: themeData.iconTheme.color,
+                    onPressed: isChatActive ? onToggleChat : null,
+                  ),
+                  IconButton(
+                    icon: isPollVisible
+                        ? Icon(Icons.quiz_outlined,
+                            color: themeData.primaryColor,
+                          )
+                        : const Icon(Icons.quiz_outlined),
+                    color: themeData.iconTheme.color,
+                    onPressed: isPollActive ? onOpenPolls : null,
+                  ),
+                ],
+              ),
+              PopupMenuButton<String>(
+                onSelected: (choice) async {
+                  if (choice == 'Pin Course') {
+                    isPinned
+                        ? await ref
+                            .read(pinnedCourseViewModelProvider.notifier)
+                            .unpinCourse(currentStream.courseID)
+                        : await ref
+                            .read(pinnedCourseViewModelProvider.notifier)
+                            .pinCourse(currentStream.courseID);
+                  } else if (choice == 'Download') {
+                    _showDownloadOptions(context);
+                  }
+                },
+                itemBuilder: (BuildContext context) {
+                  return getMenuItems(isPinned, isDownloaded)
+                      .map((Map<String, IconData> choice) {
+                    String text = choice.keys.first;
+                    IconData icon = choice.values.first;
+
+                    return PopupMenuItem<String>(
+                      value: text,
+                      child: ListTile(
+                        leading: Icon(icon, color: themeData.iconTheme.color),
+                        title: Text(
+                          text,
+                          style: TextStyle(
+                            color: themeData.textTheme.titleMedium?.color,
+                          ),
+                        ),
+                      ),
+                    );
+                  }).toList();
+                },
+                icon: Icon(Icons.more_vert, color: themeData.iconTheme.color),
+                color: themeData.popupMenuTheme.color,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(10.0),
+                  side: BorderSide(color: themeData.dividerColor),
+                ),
+                elevation:
+                    Theme.of(context).platform == TargetPlatform.iOS ? 0 : 3.0,
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/views/video_view/utils/video_player_handler.dart b/lib/views/video_view/utils/video_player_handler.dart
new file mode 100644
index 00000000..1d63e42f
--- /dev/null
+++ b/lib/views/video_view/utils/video_player_handler.dart
@@ -0,0 +1,41 @@
+import 'dart:ui';
+
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+
+class VideoPlayerHandlers {
+  final Function(String newPlaylistUrl) switchPlaylist;
+  final VoidCallback onToggleChat;
+  final VoidCallback onTogglePolls;
+
+  VideoPlayerHandlers({
+    required this.switchPlaylist,
+    required this.onToggleChat,
+    required this.onTogglePolls,
+  });
+
+  void handleMenuSelection(String choice, Stream stream) {
+    String? playlistUrl;
+    switch (choice) {
+      case 'Combined view':
+        playlistUrl = stream.playlistUrl;
+        break;
+      case 'Camera view':
+        playlistUrl = stream.playlistUrlCAM;
+        break;
+      case 'Presentation view':
+        playlistUrl = stream.playlistUrlPRES;
+        break;
+    }
+    if (playlistUrl != null) {
+      switchPlaylist(playlistUrl);
+    }
+  }
+
+  void handleOpenPolls() {
+    onTogglePolls();
+  }
+
+  void handleToggleChat() {
+    onToggleChat();
+  }
+}
diff --git a/lib/views/video_view/video_card_view.dart b/lib/views/video_view/video_card_view.dart
deleted file mode 100644
index 4db04fea..00000000
--- a/lib/views/video_view/video_card_view.dart
+++ /dev/null
@@ -1,64 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// VideoCard
-///
-/// A reusable widget that displays a video card with a thumbnail, title and subtitle.
-/// This widget is designed to be flexible and can be used to represent various
-/// types of video-related content, such as pinned videos or downloaded videos.
-///
-/// Parameters:
-///  [imageName] - The name of the image to be displayed as the thumbnail.
-///  [title] - The title of the video.
-///  [date] - The date of the video.
-///  [duration] - The duration of the video.
-class VideoCard extends StatelessWidget {
-  final String imageName;
-  final String title;
-  final String date;
-  final String duration;
-
-  const VideoCard({
-    super.key,
-    required this.imageName,
-    required this.title,
-    required this.date,
-    required this.duration,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      clipBehavior: Clip.antiAlias,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Image.asset(imageName), // Replace with actual image paths
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  title,
-                  style: const TextStyle(
-                    fontSize: 16.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 8.0),
-                Text(date),
-                const SizedBox(height: 8.0),
-                Align(
-                  alignment: Alignment.centerRight,
-                  child: Chip(
-                    label: Text(duration),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/views/video_view/video_player.dart b/lib/views/video_view/video_player.dart
new file mode 100644
index 00000000..a79dd557
--- /dev/null
+++ b/lib/views/video_view/video_player.dart
@@ -0,0 +1,397 @@
+import 'dart:async';
+
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/models/error/error_model.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:gocast_mobile/views/chat_view/chat_view.dart';
+import 'package:gocast_mobile/views/chat_view/inactive_view.dart';
+import 'package:gocast_mobile/views/chat_view/poll_view.dart';
+import 'package:gocast_mobile/views/video_view/utils/custom_video_control_bar.dart';
+import 'package:gocast_mobile/views/video_view/utils/video_player_handler.dart';
+import 'package:gocast_mobile/views/video_view/video_player_controller.dart';
+import 'package:logger/logger.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+
+class VideoPlayerPage extends ConsumerStatefulWidget {
+  final Stream stream;
+
+  const VideoPlayerPage({
+    super.key,
+    required this.stream,
+  });
+
+  @override
+  ConsumerState<VideoPlayerPage> createState() => VideoPlayerPageState();
+}
+
+class VideoPlayerPageState extends ConsumerState<VideoPlayerPage> {
+  late VideoPlayerControllerManager _controllerManager;
+  late VideoPlayerHandlers _videoPlayerHandlers;
+
+  Timer? _progressTimer;
+  bool _isChatVisible = false;
+  bool _isChatActive = false;
+  bool _isPollsVisible = false;
+  bool _isPollActive = false;
+
+  Widget _buildVideoLayout() {
+    return Column(
+      children: <Widget>[
+        Expanded(child: _controllerManager.buildVideoPlayer()),
+        CustomVideoControlBar(
+          onToggleChat: _videoPlayerHandlers.handleToggleChat,
+          onOpenPolls: _videoPlayerHandlers.handleOpenPolls,
+          currentStream: widget.stream,
+          isChatVisible: _isChatVisible,
+          isChatActive: _isChatActive,
+          isPollActive: _isPollActive,
+          isPollVisible: _isPollsVisible,
+          onDownload: (type) => _downloadVideo(widget.stream, type),
+        ),
+        Expanded(
+          child: _isChatVisible
+              ? ChatView(streamID: widget.stream.id)
+              : _isPollsVisible
+                  ? PollView(streamID: widget.stream.id)
+                  : InactiveView(streamID: widget.stream.id),
+        ),
+      ],
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _videoPlayerHandlers = VideoPlayerHandlers(
+      switchPlaylist: _switchPlaylist,
+      onToggleChat: _handleToggleChat,
+      onTogglePolls: _handleTogglePolls,
+    );
+    _initializeControllerManager();
+    Future.microtask(() async {
+      await ref
+          .read(courseViewModelProvider.notifier)
+          .getCourseWithID(widget.stream.courseID);
+      await ref.read(chatViewModelProvider.notifier).fetchChatMessages(widget.stream.id);
+      Course? course = ref
+          .read(courseViewModelProvider)
+          .course;
+      if (course != null) {
+        if (course.chatEnabled && course.vodChatEnabled && widget.stream.chatEnabled) {
+          setState(() {
+            _isChatActive = true;
+            _isPollActive = true;
+          });
+        }
+      }
+      ref
+          .read(videoViewModelProvider.notifier)
+          .switchVideoSource(widget.stream.playlistUrl);
+      _initVideoPlayer();
+      _setupProgressListener();
+    });
+  }
+
+  @override
+  void dispose() {
+    _controllerManager.dispose();
+    _progressTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(widget.stream.name)),
+      body: ref
+          .read(videoViewModelProvider)
+          .isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : _buildVideoLayout(),
+    );
+  }
+
+// Initialize the video player.
+  Future<void> _initVideoPlayer() async {
+    await _setProgress();
+    await _initializeAndSeekPlayer();
+  }
+
+// Initialize the controller manager.
+  void _initializeControllerManager() {
+    _controllerManager = VideoPlayerControllerManager(
+      currentStream: widget.stream,
+      onMenuSelection: _videoPlayerHandlers.handleMenuSelection,
+      ref: ref,
+    );
+  }
+
+  Future<void> _setProgress() async {
+    await ref
+        .read(videoViewModelProvider.notifier)
+        .fetchProgress(widget.stream.id);
+  }
+
+// Initialize the video player and seek to the last progress.
+  Future<void> _initializeAndSeekPlayer() async {
+    if (!mounted) return;
+    try {
+      await _controllerManager.initializePlayer();
+      _setLoadingState(false);
+      await _seekToLastProgress();
+    } catch (error) {
+      _handleError(error, 'Failed to initialize video player');
+    }
+  }
+
+// Seek to the last progress.
+  Future<void> _seekToLastProgress() async {
+    Progress progress =
+        ref
+            .read(videoViewModelProvider)
+            .progress ?? Progress(progress: 0.0);
+    final position = Duration(
+      seconds: (progress.progress *
+          _controllerManager.videoPlayerController.value.duration.inSeconds)
+          .round(),
+    );
+    await _controllerManager.videoPlayerController.seekTo(position);
+  }
+
+// Handle errors and update the UI accordingly.
+  void _handleError(Object error, String errorMessage) {
+    if (mounted) {
+      ref
+          .read(videoViewModelProvider)
+          .copyWith(error: AppError(errorMessage, error));
+      _setLoadingState(false);
+    }
+  }
+
+  void _setupProgressListener() {
+    _progressTimer =
+        Timer.periodic(const Duration(seconds: 5), _progressUpdateCallback);
+  }
+
+  void _progressUpdateCallback(Timer timer) async {
+    if (!_isPlayerInitialized()) return;
+    if (_controllerManager.videoPlayerController.value.isPlaying) {
+      final position = _getCurrentPosition();
+      final progress = _calculateProgress(position);
+      await _updateProgress(progress);
+      if (_shouldMarkAsWatched(progress)) {
+        await _markStreamAsWatched();
+      }
+    }
+  }
+
+  bool _isPlayerInitialized() {
+    return _controllerManager.videoPlayerController.value.isInitialized;
+  }
+
+  Duration _getCurrentPosition() {
+    return _controllerManager.videoPlayerController.value.position;
+  }
+
+  double _calculateProgress(Duration position) {
+    final duration = _controllerManager.videoPlayerController.value.duration;
+    return position.inSeconds / duration.inSeconds;
+  }
+
+  Future<void> _updateProgress(double progress) {
+    var progressData = Progress(progress: progress);
+    return ref
+        .read(videoViewModelProvider.notifier)
+        .updateProgress(widget.stream.id, progressData);
+  }
+
+  bool _shouldMarkAsWatched(double progress) {
+    const watchedThreshold = 0.9;
+    return progress >= watchedThreshold;
+  }
+
+  Future<void> _markStreamAsWatched() {
+    return ref
+        .read(videoViewModelProvider.notifier)
+        .markAsWatched(widget.stream.id);
+  }
+
+  void _switchPlaylist(String newPlaylistUrl) async {
+    if (ref
+        .read(videoViewModelProvider)
+        .videoSource == newPlaylistUrl) {
+      Logger().i("Already displaying $newPlaylistUrl");
+      return;
+    }
+    Logger().i("Switching to $newPlaylistUrl");
+    _setLoadingState(true);
+    try {
+      ref
+          .read(videoViewModelProvider.notifier)
+          .switchVideoSource(newPlaylistUrl);
+      await _controllerManager.switchVideoSource(
+        newPlaylistUrl,
+        VideoSourceType.network,
+      );
+      _setLoadingState(false);
+    } catch (error) {
+      _setLoadingState(false);
+      ref
+          .read(videoViewModelProvider)
+          .copyWith(error: AppError('Failed to load video', error));
+    }
+  }
+
+  // Simplified loading state management
+  void _setLoadingState(bool isLoading) {
+    setState(() {
+      ref.read(videoViewModelProvider).copyWith(isLoading: isLoading);
+    });
+  }
+
+  void _handleToggleChat() {
+    setState(() {
+      _isChatVisible = !_isChatVisible;
+      _isPollsVisible = false;
+    });
+  }
+
+  void _handleTogglePolls() {
+    setState(() {
+      _isChatVisible = false;
+      _isPollsVisible = !_isPollsVisible;
+    });
+  }
+
+  Future<void> _downloadVideo(Stream stream, String type) async {
+  // Extract the "Combined" download URL from the Stream object
+    bool canDownload = await _handleDownloadConnectivity(stream, type);
+    if (!canDownload) return; // Exit if download should not proceed
+
+    String? downloadUrl;
+    for (var download in stream.downloads) {
+      if (download.friendlyName == type) {
+        downloadUrl = download.downloadURL;
+        break;
+      }
+    }
+   //downloadUrl="https://file-examples.com/storage/fed61549c865b2b5c9768b5/2017/04/file_example_MP4_480_1_5MG.mp4";
+    // Check if the Combined URL is found
+    if (downloadUrl == null) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(
+            'Download type "$type" not available for this lecture',),),
+      );
+      return;
+    }
+
+    // Use the extracted URL for downloading
+    String fileName = "stream.mp4";
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+       SnackBar(content: Text(AppLocalizations.of(context)!.starting_download)),
+    );
+    // Call the download function from the StreamViewModel
+
+    ref
+        .read(downloadViewModelProvider.notifier)
+        .downloadVideo(downloadUrl, stream.id, fileName,stream.name,stream.duration,stream.description,)
+        .then((localPath) {
+      if (localPath.isNotEmpty) {
+        // Download successful
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Video Downloaded')),
+        );
+      } else {
+        // Download failed, but not due to Wi-Fi (since it would throw an exception)
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Download failed')),
+        );
+      }
+    });
+  }
+
+  Future<bool> _showDownloadConfirmationDialog() async {
+    return await showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext dialogContext) {
+        return AlertDialog(
+          title: const Text("Download Video"),
+          content: const Text(
+              "You are on mobile data. Would you like to download the video over mobile data?",),
+          actions: <Widget>[
+            TextButton(
+              child: const Text("No"),
+              onPressed: () {
+                Navigator.of(dialogContext).pop(false);
+              },
+            ),
+            TextButton(
+              child: const Text("Yes"),
+              onPressed: () {
+                Navigator.of(dialogContext).pop(true);
+              },
+            ),
+          ],
+        );
+      },
+    ) ?? false; // If dialog is dismissed, return false
+  }
+  void _showMobileDataNotAllowedDialog() {
+    showDialog(
+      context: context,
+      barrierDismissible: false, // User must tap a button for the dialog to close
+      builder: (BuildContext dialogContext) {
+        return AlertDialog(
+          title: const Text("Download Not Allowed"),
+          content: const Text(
+              "You are currently on mobile data. Video cannot be downloaded over mobile data due to your settings.",),
+          actions: <Widget>[
+            TextButton(
+              child: const Text("OK"),
+              onPressed: () {
+                Navigator.of(dialogContext).pop(); // Dismiss dialog
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Future<bool> _handleDownloadConnectivity(Stream stream, String type) async {
+    final isDownloadWithWifiOnly = ref
+        .watch(settingViewModelProvider)
+        .isDownloadWithWifiOnly;
+
+    var connectivityResult = await (Connectivity().checkConnectivity());
+
+    // If 'Download Over Wi-Fi Only' is enabled and connected to mobile, show a dialog
+    if (connectivityResult == ConnectivityResult.mobile && isDownloadWithWifiOnly) {
+      if (!mounted) return false;
+      _showMobileDataNotAllowedDialog();
+      return false;
+    }
+
+    // If on mobile data and 'Download Over Wi-Fi Only' is disabled, ask for confirmation
+    if (connectivityResult == ConnectivityResult.mobile && !isDownloadWithWifiOnly) {
+      bool shouldProceed = await _showDownloadConfirmationDialog();
+      if (!mounted) return false;
+      if (!shouldProceed) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Download cancelled')),
+        );
+        return false;
+      }
+    }
+
+    return true; // Proceed with download if all checks pass
+  }
+
+}
diff --git a/lib/views/video_view/video_player_controller.dart b/lib/views/video_view/video_player_controller.dart
new file mode 100644
index 00000000..94cf3028
--- /dev/null
+++ b/lib/views/video_view/video_player_controller.dart
@@ -0,0 +1,191 @@
+import 'package:chewie/chewie.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:gocast_mobile/base/networking/api/gocast/api_v2.pb.dart';
+import 'package:gocast_mobile/providers.dart';
+import 'package:video_player/video_player.dart';
+
+enum VideoSourceType { asset, network }
+
+class VideoPlayerControllerManager {
+  late VideoPlayerController videoPlayerController;
+  ChewieController? chewieController;
+  final Function(String, Stream)? onMenuSelection;
+  final Stream currentStream;
+  final WidgetRef ref;
+
+  VideoPlayerControllerManager({
+    this.onMenuSelection,
+    required this.currentStream,
+    required this.ref,
+  }) {
+    videoPlayerController =
+        _createVideoPlayerController(currentStream.playlistUrl);
+  }
+
+  VideoPlayerController _createVideoPlayerController(String source) {
+    VideoSourceType sourceType = _determineSourceType(source);
+    return sourceType == VideoSourceType.asset
+        ? VideoPlayerController.asset(source)
+        : VideoPlayerController.networkUrl(Uri.parse(source));
+  }
+
+  VideoSourceType _determineSourceType(String videoSource) {
+    return videoSource.startsWith('http')
+        ? VideoSourceType.network
+        : VideoSourceType.asset;
+  }
+
+  Future<void> initializePlayer() async {
+    await videoPlayerController.initialize();
+    chewieController = _createChewieController();
+  }
+
+  ChewieController _createChewieController() {
+    return ChewieController(
+      videoPlayerController: videoPlayerController,
+      aspectRatio: videoPlayerController.value.aspectRatio,
+      autoPlay: true,
+      looping: false,
+      zoomAndPan: true,
+      additionalOptions: (context) => _getAdditionalOptions(),
+      errorBuilder: (context, errorMessage) {
+        return Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                errorMessage,
+                style: const TextStyle(color: Colors.white),
+              ),
+            ],
+          ),
+        );
+      },
+      isLive: currentStream.liveNow,
+      allowMuting: true,
+      useRootNavigator: true,
+      cupertinoProgressColors: _getCupertinoProgressColors(),
+      materialProgressColors: _getMaterialProgressColors(),
+      placeholder: Container(color: Colors.black),
+      autoInitialize: true,
+      allowFullScreen: true,
+      fullScreenByDefault: false,
+      playbackSpeeds: _filteredPlaybackSpeeds(),
+      allowPlaybackSpeedChanging: true,
+    );
+  }
+
+  List<OptionItem> _getAdditionalOptions() {
+    List<OptionItem> items = [];
+    if (currentStream.hasPlaylistUrl()) {
+      items.add(
+        OptionItem(
+          onTap: () => onMenuSelection?.call('Combined view', currentStream),
+          iconData: Icons.layers,
+          title: "Combined view",
+        ),
+      );
+    }
+    if (currentStream.hasPlaylistUrlCAM()) {
+      items.add(
+        OptionItem(
+          onTap: () => onMenuSelection?.call('Camera view', currentStream),
+          iconData: Icons.camera_alt,
+          title: "Camera view",
+        ),
+      );
+    }
+    if (currentStream.hasPlaylistUrlPRES()) {
+      items.add(
+        OptionItem(
+          onTap: () =>
+              onMenuSelection?.call('Presentation view', currentStream),
+          iconData: Icons.present_to_all,
+          title: "Presentation view",
+        ),
+      );
+    }
+    if (currentStream.hasPlaylistUrlCAM() &&
+        currentStream.hasPlaylistUrlPRES()) {
+      items.add(
+        OptionItem(
+          onTap: () => onMenuSelection?.call('Split view', currentStream),
+          iconData: Icons.vertical_split_sharp,
+          title: "Split view",
+        ),
+      );
+    }
+    return items;
+  }
+
+  ChewieProgressColors _getCupertinoProgressColors() {
+    return ChewieProgressColors(
+      playedColor: Colors.blue,
+      handleColor: Colors.blueAccent,
+      backgroundColor: Colors.grey,
+      bufferedColor: Colors.lightBlueAccent,
+    );
+  }
+
+  ChewieProgressColors _getMaterialProgressColors() {
+    return ChewieProgressColors(
+      playedColor: Colors.blue,
+      handleColor: Colors.blueAccent,
+      backgroundColor: Colors.grey,
+      bufferedColor: Colors.lightBlueAccent,
+    );
+  }
+
+  Widget buildVideoPlayer() => chewieController == null
+      ? const Center(child: CircularProgressIndicator())
+      : Chewie(controller: chewieController!);
+
+  void dispose() {
+    videoPlayerController.pause();
+    videoPlayerController.dispose();
+    chewieController?.dispose();
+  }
+
+  Future<void> switchVideoSource(
+    String newSource,
+    VideoSourceType sourceType,
+  ) async {
+    await _pauseAndDisposeCurrentPlayer();
+    await _initializeNewVideoSource(newSource, sourceType);
+  }
+
+  Future<void> _pauseAndDisposeCurrentPlayer() async {
+    await videoPlayerController.pause();
+    await videoPlayerController.dispose();
+    chewieController?.dispose();
+  }
+
+  Future<void> _initializeNewVideoSource(
+    String newSource,
+    VideoSourceType sourceType,
+  ) async {
+    final oldPosition = videoPlayerController.value.position;
+    videoPlayerController = _createVideoPlayerController(newSource);
+    await initializePlayer();
+    await videoPlayerController.seekTo(oldPosition);
+    if (videoPlayerController.value.isPlaying) {
+      await videoPlayerController.play();
+    } else {
+      await videoPlayerController.pause();
+    }
+  }
+
+  List<double> _getPlaybackSpeeds() {
+    final settingViewModel = ref.read(settingViewModelProvider.notifier);
+    return settingViewModel.parsePlaybackSpeeds();
+  }
+
+  List<double> _filteredPlaybackSpeeds() {
+    final playbackSpeeds = _getPlaybackSpeeds();
+    var filteredSpeeds = playbackSpeeds.where((speed) => speed <= 2.0).toList();
+    return filteredSpeeds.isEmpty
+        ? [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2]
+        : filteredSpeeds;
+  }
+}
diff --git a/proto/gocast/api_v2.proto b/proto/gocast/api_v2.proto
index dc5abdb5..6d667c7a 100644
--- a/proto/gocast/api_v2.proto
+++ b/proto/gocast/api_v2.proto
@@ -31,16 +31,16 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 };
 
 service API {
-   // BEGIN API/V2/USER
-   rpc getUser(GetUserRequest) returns (GetUserResponse) {
+  // BEGIN API/V2/USER
+  rpc getUser(GetUserRequest) returns (GetUserResponse) {
     option (google.api.http) = {
       get: "/user/me"
       response_body: "*"
     };
     option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
       tags: "User"
-      summary: "Get the current user"
-      description: "Returns the user assigned to the token"
+      summary: "Get the current user."
+      description: "Returns a user based on the JWT claims."
     };
   }
 
@@ -52,10 +52,10 @@ service API {
     option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
       tags: "User"
       summary: "Get the current user's courses."
-      description: "Returns all courses of the current user live courses optionally filtered by year, term and paginated by limit and skip."
+      description: "Returns all courses in which the current user is enrolled in, optionally filtered by year, term, limit and skip."
     };
   }
- 
+
   rpc getUserPinned(GetUserPinnedRequest) returns (GetUserPinnedResponse) {
     option (google.api.http) = {
       get: "/user/pinned"
@@ -64,7 +64,32 @@ service API {
     option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
       tags: "User"
       summary: "Get the current user's pinned courses."
-      description: "Returns all courses pinned by the current user optionally filtered by year, term and paginated by limit and skip."
+      description: "Returns all current user's pinned courses, optionally filtered by year, term, limit and skip."
+    };
+  }
+
+  rpc postUserPinned(PostPinnedRequest) returns (PostPinnedResponse) {
+    option (google.api.http) = {
+      post: "/user/pinned"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "User"
+      summary: "Add a course to the user's pinned courses."
+      description: "Adds a course to the current user's pinned courses."
+    };
+  }
+
+  rpc deleteUserPinned(DeletePinnedRequest) returns (DeletePinnedResponse) {
+    option (google.api.http) = {
+      delete: "/user/pinned/{courseID}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "User"
+      summary: "Delete a user's pinned course."
+      description: "Removes a course from the current user's pinned courses."
     };
   }
 
@@ -76,7 +101,7 @@ service API {
     option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
       tags: "User"
       summary: "Get the current user's administered courses."
-      description: "Returns all courses that the current user is an admin of."
+      description: "Returns all courses that are administered by the current user."
     };
   }
 
@@ -88,7 +113,20 @@ service API {
     option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
       tags: "User"
       summary: "Get the current user's settings."
-      description: "Returns the settings of the current user."
+      description: "Returns current user's settings."
+    };
+  }
+
+  rpc patchUserSettings(PatchUserSettingsRequest) returns (PatchUserSettingsResponse) {
+    option (google.api.http) = {
+      patch: "/user/settings"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "User"
+      summary: "Update the current user's settings."
+      description: "Updates the current user's settings."
     };
   }
 
@@ -103,9 +141,491 @@ service API {
       description: "Returns the bookmarks created by the current user, optionally filtered by stream."
     };
   }
+
+  rpc putUserBookmark(PutBookmarkRequest) returns (PutBookmarkResponse) {
+    option (google.api.http) = {
+      put: "/user/bookmarks"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "User"
+      summary: "Create a new bookmark."
+      description: "Creates a new bookmark for the current user."
+    };
+  }
+
+  rpc patchUserBookmark(PatchBookmarkRequest) returns (PatchBookmarkResponse) {
+    option (google.api.http) = {
+      patch: "/user/bookmarks/{bookmarkID}"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "User"
+      summary: "Update a bookmark."
+      description: "Updates a bookmark of the current user."
+    };
+  }
+
+  rpc deleteUserBookmark(DeleteBookmarkRequest) returns (DeleteBookmarkResponse) {
+    option (google.api.http) = {
+      delete: "/user/bookmarks/{bookmarkID}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "User"
+      summary: "Delete a bookmark."
+      description: "Deletes a stream's bookmark (=timestamp) for the current user."
+    };
+  }
   // END API/V2/USER
+
+  // BEGIN API/V2/NOTIFICATIONS
+  rpc getBannerAlerts(GetBannerAlertsRequest) returns (GetBannerAlertsResponse) {
+    option (google.api.http) = {
+      get: "/notifications/banner-alerts"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Notifications"
+      summary: "Get all banner alerts."
+      description: "Returns all banner alerts (=system wide notifications)."
+    };
+  }
+
+  rpc getFeatureNotifications(GetFeatureNotificationsRequest) returns (GetFeatureNotificationsResponse) {
+    option (google.api.http) = {
+      get: "/notifications/feature-notifications"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Notifications"
+      summary: "Get all feature notifications."
+      description: "Returns all feature notifications (=can be user-role specific)."
+    };
+  }
+
+  rpc postDeviceToken(PostDeviceTokenRequest) returns (PostDeviceTokenResponse) {
+    option (google.api.http) = {
+      post: "/notifications/device/{deviceToken}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Notifications"
+      summary: "Post a user's device token."
+      description: "Adds a new deviceToken to the user's list of active device tokens."
+    };
+  }
+
+  rpc deleteDeviceToken(DeleteDeviceTokenRequest) returns (DeleteDeviceTokenResponse) {
+    option (google.api.http) = {
+      delete: "/notifications/device/{deviceToken}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Notifications"
+      summary: "Delete a user's device token."
+      description: "Removes an existing entry from the current user's list of active device tokens."
+    };
+  }
+  // END API/V2/NOTIFICATIONS
+
+  // BEGIN API/V2/COURSES
+  rpc getPublicCourses(GetPublicCoursesRequest) returns (GetPublicCoursesResponse) {
+    option (google.api.http) = {
+      get: "/courses/public"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Courses"
+      summary: "Get all public courses"
+      description: "Returns all public courses, optionally filtered by year, term, limit and skip. Includes courses with the visibility \"loggedIn\" if user is authenticated/valid jwt is present and courses with the visibility \"enrolled\" if the user is authenticated and enrolled in that course."
+    };
+  }
+
+  rpc getSemesters(GetSemestersRequest) returns (GetSemestersResponse) {
+    option (google.api.http) = {
+      get: "/courses/semesters"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Courses"
+      summary: "Get all semesters"
+      description: "Returns all semesters including the current one."
+    };
+  }
+
+  rpc getCourseStreams(GetCourseStreamsRequest) returns (GetCourseStreamsResponse) {
+    option (google.api.http) = {
+      get: "/courses/{courseID}/streams"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Courses"
+      summary: "Get all streams"
+      description: "Returns all streams for a given course if course is public OR user is enrolled in course and course has visibility \"enrolled\" OR user is logged / valid jwt is present and course has visibility \"loggedIn.\""
+    };
+  }
+
+  // END API/V2/COURSES
+
+  // START API/V2/STREAMS
+  rpc GetStream(GetStreamRequest) returns (GetStreamResponse) {
+    option (google.api.http) = {
+      get: "/streams/w/vod/streamID"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      summary: "Get stream for VOD"
+      description: "Returns a stream for a given streamID if stream's course is public OR stream's course has visibility \"loggedIn\" and user is logged in / valid jwt is present OR stream's course has visibility \"enrolled\" and user is enrolled in stream's course."
+    };
+  }
+
+  rpc GetNowLive(GetNowLiveRequest) returns (GetNowLiveResponse) {
+    option (google.api.http) = {
+      get: "/streams/w/live"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      description: "Returns all currently live streams if stream's course is public OR stream's course has visibility \"loggedIn\" and user is logged in / valid jwt is present OR stream's course has visibility \"enrolled\" and user is enrolled in stream's course."
+    };
+  }
+
+  rpc getThumbsVOD(GetThumbsVODRequest) returns (GetThumbsVODResponse) {
+    option (google.api.http) = {
+      get: "/streams/thumbs/vod/{streamID}/thumbs"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      summary: "Get thumbnail of VOD"
+      description: "Returns thumbnail path for a VoD, given a streamID if stream's course is public OR stream's course has visibility \"loggedIn\" and user is logged in / valid jwt is present OR stream's course has visibility \"enrolled\" and user is enrolled in stream's course."
+    };
+  }
+
+  rpc getThumbsLive(GetThumbsLiveRequest) returns (GetThumbsLiveResponse) {
+    option (google.api.http) = {
+      get: "/streams/thumbs/live/{streamID}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      summary: "Get thumbnail of livestream"
+      description: "Returns thumbnail path for a currently live stream, given a streamID if stream's course is public OR stream's course has visibility \"loggedIn\" and user is logged in / valid jwt is present OR stream's course has visibility \"enrolled\" and user is enrolled in stream's course."
+    };
+  }
+
+  rpc getProgress(GetProgressRequest) returns (GetProgressResponse) {
+    option (google.api.http) = {
+      get: "/streams/progress/{streamID}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      summary: "Get progress of stream"
+      description: "Returns current user's watch progress of stream."
+    };
+  }
+
+  rpc putProgress(PutProgressRequest) returns (PutProgressResponse) {
+    option (google.api.http) = {
+      put: "/streams/progress/{streamID}"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      summary: "Update progress of stream"
+      description: "Updates current user's watch progress of stream."
+    };
+  }
+
+  rpc markAsWatched(MarkAsWatchedRequest) returns (MarkAsWatchedResponse) {
+    option (google.api.http) = {
+      put: "/streams/progress/{streamID}/watched"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags: "Streams"
+      summary: "Mark stream as watched"
+      description: "Marks stream as watched."
+    };
+  }
+  // END API/V2/STREAMS
+
+  // START API/V2/CHATS
+  rpc getChatMessages(GetChatMessagesRequest) returns (GetChatMessagesResponse) {
+    option (google.api.http) = {
+      get: "/streams/chat/{streamID}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Get all chat messages of a stream"
+      description: "Returns all chat messages of a stream."
+    };
+  }
+
+  rpc postChatMessage(PostChatMessageRequest) returns (PostChatMessageResponse) {
+    option (google.api.http) = {
+      post: "/streams/chat/{streamID}"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Post a chat message to a stream"
+      description: "Posts a chat message to a stream."
+    };
+  }
+
+  rpc postChatReaction(PostChatReactionRequest) returns (PostChatReactionResponse) {
+    option (google.api.http) = {
+      post: "/streams/chat/{streamID}/{chatID}/reactions"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Post a reaction to a chat message"
+      description: "Posts a reaction to a chat message."
+    };
+  }
+
+  rpc deleteChatReaction(DeleteChatReactionRequest) returns (DeleteChatReactionResponse) {
+    option (google.api.http) = {
+      delete: "/streams/chat/{streamID}/{chatID}/reactions/{reactionID}"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Delete a reaction to a chat message"
+      description: "Deletes a reaction to a chat message."
+    };
+  }
+
+  rpc postChatReply(PostChatReplyRequest) returns (PostChatReplyResponse) {
+    option (google.api.http) = {
+      post: "/streams/chat/{streamID}/{chatID}/replies"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Post a reply to a chat message"
+      description: "Posts a reply to a chat message."
+    };
+  }
+
+  rpc markChatMessageAsResolved(MarkChatMessageAsResolvedRequest) returns (MarkChatMessageAsResolvedResponse) {
+    option (google.api.http) = {
+      put: "/streams/chat/{streamID}/{chatID}/resolved"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Mark a chat message as resolved"
+      description: "Marks a chat message as resolved."
+    };
+  }
+
+  rpc markChatMessageAsUnresolved(MarkChatMessageAsUnresolvedRequest) returns (MarkChatMessageAsUnresolvedResponse) {
+    option (google.api.http) = {
+      delete: "/streams/chat/{streamID}/{chatID}/resolved"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Mark a chat message as unresolved"
+      description: "Marks a chat message as unresolved."
+    };
+  }
+
+  rpc getPolls(GetPollsRequest) returns (GetPollsResponse) {
+    option (google.api.http) = {
+      get: "/streams/chat/{streamID}/polls"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Get all polls of a stream"
+      description: "Returns all polls of a stream."
+    };
+  }
+
+  rpc postPollVote(PostPollVoteRequest) returns (PostPollVoteResponse) {
+    option (google.api.http) = {
+      post: "/streams/chat/{streamID}/polls/{pollOptionID}"
+      body: "*"
+      response_body: "*"
+    };
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
+      tags:  "Chat"
+      summary: "Post a vote for an actove poll"
+      description: "Posts a vote for an active poll."
+    };
+  }
+  // END API/V2/CHATS
+
+}
+
+
+
+
+
+///////////////////////////////
+//////// CHAT_MESSAGE /////////
+///////////////////////////////
+
+
+message ChatReaction {
+  uint32 chatID = 1;
+  uint32 userID = 2;
+  string username = 3;
+  string emoji = 4;
+}
+
+message AddressedUser {
+  uint32 id = 1;
+  string username = 2;
+}
+
+message ChatMessage {
+  uint32 id = 1;
+  string userID = 2;
+  string username = 3;
+  string message = 4;
+  string sanitizedMessage = 5;
+  uint32 streamID = 6;
+  string color = 7;
+  bool isVisible = 8;
+  repeated ChatReaction reactions = 9;
+  repeated ChatMessage replies = 10;
+  repeated AddressedUser addressedUsers = 11;
+  bool isResolved = 12;
+  google.protobuf.Timestamp createdAt = 13;
+  bool isAdmin = 14;
+}
+
+///////////////////////////////
+//////// CHAT_REQUEST /////////
+///////////////////////////////
+
+message GetChatMessagesRequest {
+  uint32 streamID = 1;
+}
+
+message PostChatMessageRequest {
+  string message = 1;
+  uint32 streamID = 2;
+}
+
+message PostChatReactionRequest {
+  string emoji = 1;
+  uint32 streamID = 2;
+  uint32 chatID = 3;
+}
+
+message DeleteChatReactionRequest {
+  uint32 streamID = 1;
+  uint32 chatID = 2;
+  uint32 reactionID = 3;
+}
+
+message PostChatReplyRequest {
+  string message = 1;
+  uint32 streamID = 2;
+  uint32 chatID = 3;
+}
+
+message MarkChatMessageAsResolvedRequest {
+  uint32 streamID = 1;
+  uint32 chatID = 2;
+}
+
+message MarkChatMessageAsUnresolvedRequest {
+  uint32 streamID = 1;
+  uint32 chatID = 2;
+}
+
+///////////////////////////////
+//////// CHAT_RESPONSE ////////
+///////////////////////////////
+
+message GetChatMessagesResponse {
+  repeated ChatMessage messages = 1;
+}
+
+message PostChatMessageResponse {
+  ChatMessage message = 1;
+}
+
+message PostChatReactionResponse {
+  ChatReaction reaction = 1;
+}
+
+message DeleteChatReactionResponse {}
+
+message PostChatReplyResponse {
+  ChatMessage reply = 1;
+}
+
+message MarkChatMessageAsResolvedResponse {
+  ChatMessage message = 1;
+}
+
+message MarkChatMessageAsUnresolvedResponse {
+  ChatMessage message = 1;
+}
+
+///////////////////////////////
+//////// POLL_MESSAGE /////////
+///////////////////////////////
+
+
+message Poll {
+  uint32 id = 1;
+  uint32 streamID = 2;
+  string question = 3;
+  bool active = 4;
+  repeated PollOption pollOptions = 5;
 }
 
+message PollOption {
+  uint32 id = 1;
+  string answer = 2;
+  uint32 votes = 3;
+  bool voted = 4;
+}
+
+///////////////////////////////
+//////// POLL_REQUEST /////////
+///////////////////////////////
+
+message GetPollsRequest {
+  uint32 streamID = 1;
+}
+
+message PostPollVoteRequest {
+  uint32 streamID = 1;
+  uint32 pollOptionID = 2;
+}
+
+///////////////////////////////
+//////// POLL_RESPONSE ////////
+///////////////////////////////
+
+message GetPollsResponse {
+  repeated Poll polls = 1;
+}
+
+message PostPollVoteResponse {}
+
 ///////////////////////////////
 //////// USER_MESSAGE /////////
 ///////////////////////////////
@@ -126,8 +646,6 @@ message User {
 }
 
 message UserSetting {
-  uint32 id = 1;
-  uint32 userID = 2;
   UserSettingType type = 3;
   string value = 4;
 }
@@ -145,24 +663,39 @@ enum UserSettingType {
 message GetUserRequest {}
 
 message GetUserCoursesRequest {
-  int32 year = 1;
+  uint32 year = 1;
   string term = 2;
-  string query = 3;
-  int32 limit = 4;
-  int32 skip = 5;
+  uint32 limit = 3;
+  uint32 skip = 4;
 }
 
 message GetUserPinnedRequest {
-  int32 year = 1;
-  string term = 2;
-  int32 limit = 3;
-  int32 skip = 4;
+  uint32 year = 1;
+  string term = 2; 
+  uint32 limit = 3;
+  uint32 skip = 4;
 }
 
 message GetUserAdminRequest {}
 
 message GetUserSettingsRequest {}
 
+message PatchUserSettingsRequest {
+  repeated UserSetting userSettings = 1;
+}
+
+message PatchUserSettingsResponse {
+  repeated UserSetting userSettings = 1;
+}
+
+message PostPinnedRequest {
+  uint32 courseID = 1;
+}
+
+message DeletePinnedRequest {
+  uint32 courseID = 1;
+}
+
 ///////////////////////////////
 //////// USER_RESPONSE ////////
 ///////////////////////////////
@@ -187,6 +720,10 @@ message GetUserSettingsResponse {
   repeated UserSetting userSettings = 1;
 }
 
+message PostPinnedResponse {}
+
+message DeletePinnedResponse {}
+
 ///////////////////////////////
 ////// BOOKMARK_MESSAGE ///////
 ///////////////////////////////
@@ -206,7 +743,27 @@ message Bookmark {
 ///////////////////////////////
 
 message GetBookmarksRequest {
-  int32 streamID = 1;
+  uint32 streamID = 1;
+}
+
+message PutBookmarkRequest {
+  string description = 1;
+  uint32 hours = 2;
+  uint32 minutes = 3;
+  uint32 seconds = 4;
+  uint32 streamID = 5;
+}
+
+message PatchBookmarkRequest {
+  string description = 1;
+  uint32 hours = 2;
+  uint32 minutes = 3;
+  uint32 seconds = 4;
+  uint32 bookmarkID = 5;
+}
+
+message DeleteBookmarkRequest {
+  uint32 bookmarkID = 1;
 }
 
 ///////////////////////////////
@@ -217,6 +774,68 @@ message GetBookmarksResponse {
   repeated Bookmark bookmarks = 1;
 }
 
+message PutBookmarkResponse {
+  Bookmark bookmark = 1;
+}
+
+message PatchBookmarkResponse {
+  Bookmark bookmark = 1;
+}
+
+message DeleteBookmarkResponse {}
+
+
+///////////////////////////////
+//// NOTIFICATION_MESSAGE /////
+///////////////////////////////
+
+message BannerAlert {
+  uint32 id = 1;
+  string startsAt = 2;
+  string expiresAt = 3;
+  string text = 4;
+  bool warn = 5;
+}
+
+message FeatureNotification {
+  uint32 id = 1;
+  string Title = 2;
+  string Body = 3;
+  uint32 Target = 4;
+}
+
+message PostDeviceTokenRequest {
+  string deviceToken = 1;
+}
+
+message DeleteDeviceTokenRequest {
+  string deviceToken = 1;
+}
+
+///////////////////////////////
+//// NOTIFICATION_REQUEST /////
+///////////////////////////////
+
+message GetBannerAlertsRequest {}
+
+message GetFeatureNotificationsRequest {}
+
+message PostDeviceTokenResponse {}
+
+message DeleteDeviceTokenResponse {}
+
+///////////////////////////////
+//// NOTIFICATION_RESPONSE ////
+///////////////////////////////
+
+message GetBannerAlertsResponse {
+  repeated BannerAlert bannerAlerts = 1;
+}
+
+message GetFeatureNotificationsResponse {
+  repeated FeatureNotification featureNotifications = 1;
+}
+
 ///////////////////////////////
 /////// COURSE_MESSAGE ////////
 ///////////////////////////////
@@ -236,11 +855,46 @@ message Course {
   repeated Stream streams = 12;
   string cameraPresetPreferences = 13;
   string sourcePreferences = 14;
+  uint32 lastRecordingID = 15;
+  uint32 nextLectureID = 16;
 }
 
 message Semester { 
-  string teachingTerm = 3;
-  uint32 year = 4;
+  string teachingTerm = 1;
+  uint32 year = 2;
+}
+
+///////////////////////////////
+/////// COURSE_REQUEST ////////
+///////////////////////////////
+
+message GetPublicCoursesRequest {
+  uint32 year = 1;
+  string term = 2;
+  uint32 limit = 3;
+  uint32 skip = 4;
+}
+
+message GetSemestersRequest {}
+
+message GetCourseStreamsRequest {
+  uint32 courseID = 1;
+}
+///////////////////////////////
+/////// COURSE_RESPONSE ///////
+///////////////////////////////
+
+message GetPublicCoursesResponse {
+  repeated Course courses = 1;
+}
+
+message GetSemestersResponse { 
+  Semester current = 1;
+  repeated Semester semesters = 2;
+}
+
+message GetCourseStreamsResponse {
+  repeated Stream streams = 1;
 }
 
 ///////////////////////////////
@@ -248,7 +902,7 @@ message Semester {
 ///////////////////////////////
 
 message Stream {
-  uint64 id = 1;
+  uint32 id = 1;
   string name = 2;
   string description = 3;
   uint32 courseID = 4;
@@ -271,5 +925,102 @@ message Stream {
   uint32 vodViews = 21;
   uint32 startOffset = 22;
   uint32 endOffset = 23;
-  int32 duration = 28;
+  uint32 duration = 28;
+  repeated Download downloads = 29;
+  bool isPlanned = 30;
+  bool isComingUp = 31;
+  string HLSUrl = 32;
 }
+
+///////////////////////////////
+/////// STREAM_REQUESTS ///////
+///////////////////////////////
+
+message GetStreamRequest {
+  uint32 streamID = 1;
+}
+
+message GetNowLiveRequest {}
+
+message GetThumbsLiveRequest {
+  uint32 streamID = 1;
+}
+
+message GetThumbsVODRequest {
+  uint32 streamID = 1;
+}
+
+///////////////////////////////
+////// STREAM_RESPONSES ///////
+///////////////////////////////
+
+message GetStreamResponse {
+  Stream stream = 1;
+}
+
+message GetNowLiveResponse {
+  repeated Stream stream = 1;
+}
+
+message GetThumbsVODResponse {
+  string path = 1;
+}
+
+message GetThumbsLiveResponse {
+  string path = 1;
+}
+
+///////////////////////////////
+////// DOWNLOAD_MESSAGE ///////
+///////////////////////////////
+
+message Download {
+  string friendlyName = 1;
+  string downloadURL = 2;
+}
+
+
+///////////////////////////////
+////// PROGRESS_MESSAGE ///////
+///////////////////////////////
+
+message Progress {
+  float progress = 1;
+  bool  watched = 2;
+  uint32 userID = 3;
+  uint32 streamID = 4;
+}
+
+///////////////////////////////
+////// PROGRESS_REQUEST ///////
+///////////////////////////////
+
+message GetProgressRequest {
+  uint32 streamID = 1;
+}
+
+message PutProgressRequest {
+  float progress = 1;
+  uint32 streamID = 3;
+}
+
+message MarkAsWatchedRequest {
+  uint32 streamID = 1;
+}
+
+///////////////////////////////
+////// PROGRESS_RESPONSE //////
+///////////////////////////////
+
+message GetProgressResponse {
+  Progress progress = 1;
+}
+
+message PutProgressResponse {
+  Progress progress = 1;
+}
+
+message MarkAsWatchedResponse {
+  Progress progress = 1;
+}
+
diff --git a/pubspec.lock b/pubspec.lock
index 81636e23..d5e227fd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,14 +1,22 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _flutterfire_internals:
+    dependency: transitive
+    description:
+      name: _flutterfire_internals
+      sha256: f5628cd9c92ed11083f425fd1f8f1bc60ecdda458c81d73b143aeda036c35fe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.16"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.9"
+    version: "3.4.10"
   args:
     dependency: transitive
     description:
@@ -49,6 +57,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  chewie:
+    dependency: "direct main"
+    description:
+      name: chewie
+      sha256: "3427e469d7cc99536ac4fbaa069b3352c21760263e65ffb4f0e1c054af43a73e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.7.4"
   clock:
     dependency: transitive
     description:
@@ -65,6 +81,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.18.0"
+  connectivity_plus:
+    dependency: "direct main"
+    description:
+      name: connectivity_plus
+      sha256: "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.2"
+  connectivity_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: connectivity_plus_platform_interface
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   convert:
     dependency: transitive
     description:
@@ -89,6 +121,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  dbus:
+    dependency: transitive
+    description:
+      name: dbus
+      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.10"
   dio:
     dependency: "direct main"
     description:
@@ -129,6 +185,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      sha256: "96607c0e829a581c2a483c658f04e8b159964c3bae2730f73297070bc85d40bb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.24.2"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.0"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      sha256: d585bdf3c656c3f7821ba1bd44da5f13365d22fcecaf5eb75c4295246aaa83c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.10.0"
+  firebase_messaging:
+    dependency: "direct main"
+    description:
+      name: firebase_messaging
+      sha256: "980259425fa5e2afc03e533f33723335731d21a56fd255611083bceebf4373a8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.7.10"
+  firebase_messaging_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_messaging_platform_interface
+      sha256: "54e283a0e41d81d854636ad0dad73066adc53407a60a7c3189c9656e2f1b6107"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.18"
+  firebase_messaging_web:
+    dependency: transitive
+    description:
+      name: firebase_messaging_web
+      sha256: "90dc7ed885e90a24bb0e56d661d4d2b5f84429697fd2cbb9e5890a0ca370e6f4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.5.18"
   fixnum:
     dependency: "direct main"
     description:
@@ -158,6 +262,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_riverpod:
     dependency: "direct main"
     description:
@@ -214,6 +323,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  flutter_slidable:
+    dependency: "direct main"
+    description:
+      name: flutter_slidable
+      sha256: "19ed4813003a6ff4e9c6bcce37e792a2a358919d7603b2b31ff200229191e44c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -240,22 +357,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.4"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.4"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   http2:
     dependency: transitive
     description:
       name: http2
-      sha256: "38db0c4aa9f1cd238a5d2e86aa0cc7cc91c77e0c6c94ba64bbe85e4ff732a952"
+      sha256: "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   http_parser:
     dependency: transitive
     description:
@@ -264,6 +389,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.18.1"
   js:
     dependency: transitive
     description:
@@ -272,6 +405,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.7"
+  jwt_decode:
+    dependency: "direct main"
+    description:
+      name: jwt_decode
+      sha256: d2e9f68c052b2225130977429d30f187aa1981d789c76ad104a32243cfdebfbb
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   lints:
     dependency: transitive
     description:
@@ -320,6 +461,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  nm:
+    dependency: transitive
+    description:
+      name: nm
+      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
+  package_info_plus:
+    dependency: transitive
+    description:
+      name: package_info_plus
+      sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.1"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   path:
     dependency: transitive
     description:
@@ -329,29 +494,29 @@ packages:
     source: hosted
     version: "1.8.3"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -364,10 +529,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
@@ -376,30 +541,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.3"
+    version: "3.7.4"
   protobuf:
     dependency: "direct main"
     description:
@@ -460,10 +633,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7"
+      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.4"
+    version: "2.3.5"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -476,10 +649,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a
+      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   shared_preferences_web:
     dependency: transitive
     description:
@@ -557,6 +730,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.1"
+  tuple:
+    dependency: "direct main"
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   typed_data:
     dependency: transitive
     description:
@@ -597,6 +778,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
+  url_launcher:
+    dependency: "direct main"
+    description:
+      name: url_launcher
+      sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.4"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.2"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.4"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.3"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
   vector_math:
     dependency: transitive
     description:
@@ -605,6 +850,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  video_player:
+    dependency: "direct main"
+    description:
+      name: video_player
+      sha256: fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.8.2"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      sha256: "7f8f25d7ad56819a82b2948357f3c3af071f6a678db33833b26ec36bbc221316"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.11"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.2"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      sha256: "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
+  wakelock_plus:
+    dependency: transitive
+    description:
+      name: wakelock_plus
+      sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  wakelock_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: wakelock_plus_platform_interface
+      sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   web:
     dependency: transitive
     description:
@@ -617,50 +918,58 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf"
+      sha256: "71e1bfaef41016c8d5954291df5e9f8c6172f1f6ff3af01b5656456ddb11f94c"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.2"
+    version: "4.4.4"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "8326ee235f87605a2bfc444a4abc897f4abc78d83f054ba7d3d1074ce82b4fbf"
+      sha256: "4ea3c4e1b8ed590162b15b8a61b41b1ef3ff179a314627c16ce40c086d94b8af"
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.1"
+    version: "3.14.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "68e86162aa8fc646ae859e1585995c096c95fc2476881fa0c4a8d10f56013a5a"
+      sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.10.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: accdaaa49a2aca2dc3c3230907988954cdd23fed0a19525d6c9789d380f4dc76
+      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.4"
+    version: "3.10.2"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574
+      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "5.2.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "6.5.0"
 sdks:
   dart: ">=3.2.0 <4.0.0"
   flutter: ">=3.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 3550b3c2..4d6adfaf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,11 +7,14 @@ environment:
   sdk: '>=3.1.5 <4.0.0'
 
 dependencies:
+  connectivity_plus: ^5.0.2
+  tuple: ^2.0.1
   bloc: ^8.1.2
   cookie_jar: ^4.0.8
   dio_cookie_manager: ^3.1.1
   flutter:
     sdk: flutter
+  intl: any
   webview_flutter: ^4.4.2
   flutter_inappwebview: ^5.8.0
   provider: ^6.1.1
@@ -22,10 +25,19 @@ dependencies:
   grpc: ^3.2.4
   dio: ^5.4.0
   fixnum: ^1.1.0
+  flutter_slidable: ^3.0.1
   protobuf: ^3.1.0
   logger: ^2.0.2+1
   flutter_secure_storage: ^9.0.0
-
+  video_player: ^2.8.2
+  firebase_core: ^2.24.2
+  firebase_messaging: ^14.7.10
+  chewie: ^1.7.4
+  url_launcher: ^6.2.3
+  path_provider: any
+  jwt_decode: ^0.3.1
+  flutter_localizations:
+    sdk: flutter
 
 dev_dependencies:
   flutter_test:
@@ -38,3 +50,4 @@ flutter:
   generate: true
   assets:
     - assets/images/
+    - assets/
diff --git a/setup_grpc.sh b/setup_grpc.sh
index 96bf1747..42a5baca 100755
--- a/setup_grpc.sh
+++ b/setup_grpc.sh
@@ -14,7 +14,7 @@ mkdir -p proto/gocast
 
 # Download the api_v2.proto file
 # TODO: Replace with actual proto file on dev branch once api/v2 is implemented
-curl -o proto/gocast/api_v2.proto https://raw.githubusercontent.com/TUM-Dev/gocast/IPraktikum-36-user-endpoints/api_v2/api_v2.proto
+curl -o proto/gocast/api_v2.proto https://raw.githubusercontent.com/TUM-Dev/gocast/IPraktikum-dev/api_v2/api_v2.proto
 
 # Run the protoc command to generate Dart gRPC code
 protoc --dart_out=grpc:lib/base/networking/api -I./proto google/protobuf/timestamp.proto google/protobuf/empty.proto proto/gocast/api_v2.proto