diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8d870cc..7808252 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.USE_BIOMETRIC"/>
     <application
         android:label="login_mobile"
         android:name="${applicationName}"
@@ -7,10 +8,12 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:enableOnBackInvokedCallback="true"
+            >
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/android/app/src/main/kotlin/com/example/login_mobile/MainActivity.kt b/android/app/src/main/kotlin/com/example/login_mobile/MainActivity.kt
index 9b90eec..4659ed1 100644
--- a/android/app/src/main/kotlin/com/example/login_mobile/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/login_mobile/MainActivity.kt
@@ -1,6 +1,8 @@
 package com.example.login_mobile
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterFragmentActivity() {
+    // ...
 }
+
diff --git a/lib/features/auth/domain/entities/user.dart b/lib/features/auth/domain/entities/user.dart
index 0317ea5..b24507c 100644
--- a/lib/features/auth/domain/entities/user.dart
+++ b/lib/features/auth/domain/entities/user.dart
@@ -1,6 +1,6 @@
 class User {
   //final String uuid;
-  //final String username;
+  final String? username;
   //final int statusCode;
   //final String? message;
   final String token;
@@ -8,7 +8,7 @@ class User {
   //TODO?: add required
   User({
     //required this.uuid,
-    //required this.username,
+    required this.username,
     //required this.statusCode,
     //required this.message,
     required this.token,
diff --git a/lib/features/auth/infrastructure/datasources/auth_datasource_impl.dart b/lib/features/auth/infrastructure/datasources/auth_datasource_impl.dart
index 1a92c5d..528b611 100644
--- a/lib/features/auth/infrastructure/datasources/auth_datasource_impl.dart
+++ b/lib/features/auth/infrastructure/datasources/auth_datasource_impl.dart
@@ -7,13 +7,13 @@ import 'package:login_mobile/features/auth/infrastructure/infrastructure.dart';
 class AuthDataSourceImpl extends AuthDataSource {
   final dio = Dio(BaseOptions(
     baseUrl: Enviroment.apiURL,
-    
   ));
 
   @override
   Future<User> checkAuthStatus(String token) async {
     try {
-      final response = await dio.post('/challenge',
+      final response = await dio.post('/refreshtoken',
+          data: {'token': token},
           options: Options(headers: {'Authorization': 'Bearer $token'}));
       final user = UserMapper.userJsonToEntity(response.data);
       return user;
diff --git a/lib/features/auth/infrastructure/mappers/user_mapper.dart b/lib/features/auth/infrastructure/mappers/user_mapper.dart
index bedbc33..d944ec5 100644
--- a/lib/features/auth/infrastructure/mappers/user_mapper.dart
+++ b/lib/features/auth/infrastructure/mappers/user_mapper.dart
@@ -4,11 +4,12 @@ class UserMapper {
 
   static User userJsonToEntity(Map<String, dynamic> json) {
     return User(
+      //TODO: setup new user model with new fields returned from Proxy...
       //uuid: json['uuid'],
-      //username: json['username'],
+      username: json['username'],
       //statusCode: json['statusCode'],
       //message: json['message'],
-      token: json['jwt']
+      token: json['token']
     );
   }
 }
diff --git a/lib/features/auth/presentation/providers/auth_provider.dart b/lib/features/auth/presentation/providers/auth_provider.dart
index fb7fb3e..a4946c1 100644
--- a/lib/features/auth/presentation/providers/auth_provider.dart
+++ b/lib/features/auth/presentation/providers/auth_provider.dart
@@ -6,7 +6,11 @@ Nos permite a nosotros llegar a nuestro backend directamente
 DataSource tiene las conexiones e implementaciones necesarias
 */
 
+import 'dart:async';
+
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:local_auth/local_auth.dart';
 import 'package:login_mobile/features/auth/infrastructure/infrastructure.dart';
 import 'package:login_mobile/features/shared/infrastructure/inputs/services/key_value_storage_impl.dart';
 import 'package:login_mobile/features/shared/infrastructure/inputs/services/key_value_storage_services.dart';
@@ -28,29 +32,46 @@ final authProvider = StateNotifierProvider<AuthNotifier, AuthState>((ref) {
 class AuthNotifier extends StateNotifier<AuthState> {
   final AuthRepository authRepository;
   final KeyValueStorageService keyValueStorageService;
+  final LocalAuthentication auth = LocalAuthentication();
+  final Function? closeModalCallback;
 
   AuthNotifier({
     required this.authRepository,
     required this.keyValueStorageService,
+    this.closeModalCallback,
   }) : super(AuthState()) {
     checkAuthStatus();
   } //no hace falta mandar nada porque todo son valores opcinonales
   //estas funciones terminan delegando en el repositorio
 
-  Future<void> loginUser(String email, String password) async {
+  Future<void> loginUser(String username, String password,
+      {bool biometric = false, bool authBiometric = false}) async {
     await Future.delayed(const Duration(milliseconds: 500));
-
     try {
-      final user = await authRepository.login(email, password);
-      _setLoggedUser(user);
+      final user = await authRepository.login(username, password);
+      _setUsername(username);
+      if (biometric == false) {
+        _setTempLoggedUser(user);
+      }
+      if (biometric == true && state.user != null) {
+        _setBiometricLoggedUser(user);
+      }
+      if (closeModalCallback != null) {
+        closeModalCallback!();
+      }
     } on CustomError catch (e) {
-      logout(e.message);
+      if (biometric == false) {
+        logout(e.message);
+      } else {
+        biometricError(e.message);
+      }
     } catch (e) {
-      logout('Something went wrong');
+      if (biometric == false) {
+        logout('Something went wrong');
+      } else {
+        biometricError('Your username or password is incorrect');
+      }
     }
-
-    //final user = await authRepository.login(email, password);
-    //state = state.copyWith(user: user, authStatus: AuthStatus.authenticated); //copia del usuario donde ya tengo el estado
   }
 
   //TODO: implementar el registro
@@ -60,49 +81,136 @@ class AuthNotifier extends StateNotifier<AuthState> {
   void checkAuthStatus() async {
     final token = await keyValueStorageService.getValue<String>('token');
     if (token == null) return logout();
-
     try {
-      //el repositorio hace la auth
       final user = await authRepository.checkAuthStatus(token);
-      _setLoggedUser(user);
+      _setBiometricLoggedUser(user);
     } catch (e) {
       logout();
     }
   }
 
-  void _setLoggedUser(User user) async {
+  void _setTempLoggedUser(User user) async {
+    state = state.copyWith(
+        user: user, errorMessage: '', authStatus: AuthStatus.authenticated);
+  }
+
+  Future<void> _setBiometricLoggedUser(User user) async {
     await keyValueStorageService.setKeyValue('token', user.token);
+    await keyValueStorageService.setKeyValue('hasBiometric', true);
+    state = state.copyWith(
+      user: user,
+      errorMessage: '',
+      authStatus: AuthStatus.authenticated,
+      hasBiometric: true,
+    );
+  }
 
+  void disableBiometric(ref) async {
+    await keyValueStorageService.removeKey('token');
+    await keyValueStorageService.removeKey('hasBiometric');
     state = state.copyWith(
-        user: user, errorMessage: '', authStatus: AuthStatus.authenticated);
+        user: null,
+        errorMessage: '',
+        authStatus: AuthStatus.authenticated,
+        hasBiometric: false);
+    //Aqui puedo abrir otro modal
+    // showModalBottomSheet(
+    //     isScrollControlled: true,
+    //     context: ref,
+    //     builder: (context) => const CustomLogin());
+  }
+
+  void _setUsername(String username) async {
+    await keyValueStorageService.setKeyValue('username', username);
   }
 
   Future<void> logout([String? errorMessage]) async {
-    await keyValueStorageService.removeKey('token');
+    //await keyValueStorageService.removeKey('token');
+    await keyValueStorageService.removeKey('username');
     state = state.copyWith(
         user: null,
         errorMessage: errorMessage,
         authStatus: AuthStatus.notAuthenticated);
   }
+
+  Future<void> biometricError([String? errorMessage]) async {
+    state = state.copyWith(
+      errorMessage: errorMessage,
+    );
+  }
+
+  Future<bool> authWithBiometrics() async {
+    bool authenticated = false;
+    try {
+      state = state.copyWith(authStatus: AuthStatus.checking);
+      authenticated = await auth.authenticate(
+        localizedReason:
+            'Scan your fingerprint (or face or whatever) to authenticate',
+        options: const AuthenticationOptions(
+          stickyAuth: true,
+          biometricOnly: true,
+        ),
+      );
+      if (authenticated) {
+        state = state.copyWith(authStatus: AuthStatus.authenticated);
+      } else {
+        state = state.copyWith(authStatus: AuthStatus.notAuthenticated);
+      }
+    } on PlatformException catch (e) {
+      state = state.copyWith(
+          errorMessage: 'Error - ${e.message}',
+          authStatus: AuthStatus.notAuthenticated);
+    }
+    return authenticated;
+  }
+
+  Future<bool> loginWithBiometrics() async {
+    try {
+      final token = await keyValueStorageService.getValue<String>('token');
+      if (token == null) {
+        return false;
+      }
+      final user = await authRepository.checkAuthStatus(token);
+      state = state.copyWith(
+        user: user,
+        errorMessage: '',
+        authStatus: AuthStatus.authenticated,
+      );
+      authWithBiometrics();
+      return true;
+    } catch (e) {
+      state = state.copyWith(
+        errorMessage: 'Error: $e',
+        authStatus: AuthStatus.notAuthenticated,
+      );
+      return false;
+    }
+  }
 }
 
-enum AuthStatus { checking, authenticated, notAuthenticated }
+enum AuthStatus { checking, authenticated, notAuthenticated, hasBiometric }
 
 class AuthState {
   final AuthStatus authStatus;
   final User? user;
   final String errorMessage;
+  final bool? hasBiometric;
 
   AuthState(
       {this.authStatus = AuthStatus.checking,
       this.user,
-      this.errorMessage = ''});
+      this.errorMessage = '',
+      this.hasBiometric});
 
   AuthState copyWith(
-          {AuthStatus? authStatus, User? user, String? errorMessage}) =>
+          {AuthStatus? authStatus,
+          User? user,
+          String? errorMessage,
+          bool? hasBiometric}) =>
       AuthState(
         authStatus: authStatus ?? this.authStatus,
         user: user ?? this.user,
         errorMessage: errorMessage ?? this.errorMessage,
+        hasBiometric: hasBiometric ?? this.hasBiometric,
       );
 }
diff --git a/lib/features/auth/presentation/providers/login_form_provider.dart b/lib/features/auth/presentation/providers/login_form_provider.dart
index 939b641..8e834c8 100644
--- a/lib/features/auth/presentation/providers/login_form_provider.dart
+++ b/lib/features/auth/presentation/providers/login_form_provider.dart
@@ -50,7 +50,7 @@ class LoginFormState {
 // LoginFormNotifier es el que controla cuando cambia el email y el password
 //! 2 - Cómo implemenrtamos un notifier provider
 class LoginFormNotifier extends StateNotifier<LoginFormState> {
-  final Function(String, String) loginUserCallback;
+  final Function(String, String, {bool biometric}) loginUserCallback;
   LoginFormNotifier({required this.loginUserCallback})
       : super(LoginFormState());
   onUsernameChange(String value) {
@@ -73,8 +73,32 @@ class LoginFormNotifier extends StateNotifier<LoginFormState> {
 
   onFormSubmitted() async {
     _touchEveryField();
-    if (!state.isValid) return;
+    if (!state.isValid) {
+      return;
+    }
+    state = state.copyWith(isPosting: true); //actualiza el estado
+
+    await loginUserCallback(state.username.value, state.password.value);
 
+    state = state.copyWith(isPosting: false);
+  }
+
+  onFormSubmittedBiometric() async {
+    _touchEveryField();
+    if (state.isValid) {
+      return await loginUserCallback(state.username.value, state.password.value,
+          biometric: true);
+    }
+    state = state.copyWith(isPosting: true); //actualiza el estado
+
+    state = state.copyWith(isPosting: false);
+  }
+
+  onFormAuthBiometric() async {
+    _touchEveryField();
+    if (!state.isValid) {
+      return;
+    }
     state = state.copyWith(isPosting: true); //actualiza el estado
 
     await loginUserCallback(state.username.value, state.password.value);
diff --git a/lib/features/auth/presentation/screens/login_screen.dart b/lib/features/auth/presentation/screens/login_screen.dart
index 0ccbcb1..967c090 100644
--- a/lib/features/auth/presentation/screens/login_screen.dart
+++ b/lib/features/auth/presentation/screens/login_screen.dart
@@ -75,6 +75,9 @@ class _LoginForm extends ConsumerWidget {
   @override
   //WidgetRef ref: todos los provider de RiverPod
   Widget build(BuildContext context, WidgetRef ref) {
+    final textStyles = Theme.of(context).textTheme;
+    final hasBiometric = ref.watch(authProvider).hasBiometric;
+
     final loginForm =
         ref.watch(loginFormProvider); //acceso al state no al notifier
 
@@ -83,8 +86,6 @@ class _LoginForm extends ConsumerWidget {
       showSnackbar(context, next.errorMessage);
     });
 
-    final textStyles = Theme.of(context).textTheme;
-
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       child: Column(
@@ -112,10 +113,29 @@ class _LoginForm extends ConsumerWidget {
               width: double.infinity,
               height: 60,
               child: CustomFilledButton(
-                text: 'Sign in',
-                buttonColor: Colors.black,
-                onPressed: loginForm.isPosting ? null : ref.read(loginFormProvider.notifier).onFormSubmitted //si no posteo mando ref a la func
-              )),
+                  text: 'Sign in',
+                  buttonColor: Colors.black,
+                  onPressed: loginForm.isPosting
+                      ? null
+                      : ref
+                          .read(loginFormProvider.notifier)
+                          .onFormSubmitted //si no posteo mando ref a la func
+                  )),
+          const SizedBox(height: 10),
+          if (hasBiometric == true)
+            SizedBox(
+                width: double.infinity,
+                height: 60,
+                child: CustomFilledButton(
+                    text: 'Sign in with biometric',
+                    buttonColor: Colors.black,
+                    onPressed: loginForm.isPosting
+                        ? null
+                        : () {
+                            ref
+                                .read(authProvider.notifier)
+                                .loginWithBiometrics();
+                          })),
           const Spacer(flex: 2),
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/features/shared/infrastructure/inputs/services/key_value_storage_impl.dart b/lib/features/shared/infrastructure/inputs/services/key_value_storage_impl.dart
index c820cb3..79256cd 100644
--- a/lib/features/shared/infrastructure/inputs/services/key_value_storage_impl.dart
+++ b/lib/features/shared/infrastructure/inputs/services/key_value_storage_impl.dart
@@ -16,6 +16,8 @@ class KeyValueStorageServiceImpl extends KeyValueStorageService {
         return prefs.getInt(key) as T?;
       case String:
         return prefs.getString(key) as T?;
+      case bool:
+        return prefs.getBool(key) as T?;
 
       default:
         throw UnimplementedError('GET Type not supported ${T.runtimeType}');
@@ -38,6 +40,9 @@ class KeyValueStorageServiceImpl extends KeyValueStorageService {
       case String:
         prefs.setString(key, value as String);
         break;
+      case bool:
+        prefs.setBool(key, value as bool);
+        break;
 
       default:
         throw UnimplementedError('SET Type not supported ${T.runtimeType}');
diff --git a/lib/features/shared/widgets/bottom_sheet.dart b/lib/features/shared/widgets/bottom_sheet.dart
new file mode 100644
index 0000000..5944efc
--- /dev/null
+++ b/lib/features/shared/widgets/bottom_sheet.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:login_mobile/features/auth/presentation/providers/auth_provider.dart';
+import 'package:login_mobile/features/auth/presentation/providers/login_form_provider.dart';
+import 'package:login_mobile/features/shared/shared.dart';
+
+class CustomLogin extends ConsumerWidget {
+  const CustomLogin({Key? key}) : super(key: key);
+
+  void showSnackbar(BuildContext context, String message) {
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
+    ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+      elevation: 8,
+      content: Text(message),
+      backgroundColor: Colors.red,
+      behavior: SnackBarBehavior.floating,
+    ));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final loginForm =
+        ref.watch(loginFormProvider); //acceso al state no al notifier
+
+    //va escuchando los cambios del state
+    ref.listen(authProvider, (previous, next) {
+      if (next.errorMessage.isEmpty) return;
+      showSnackbar(context, next.errorMessage);
+    });
+
+    final textStyles = Theme.of(context).textTheme;
+
+    return GestureDetector(
+        onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
+        child: SingleChildScrollView(
+          padding:
+              EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+          child: SizedBox(
+            height: 400,
+            child: Padding(
+              padding: const EdgeInsets.all(25.0),
+              child: Column(
+                children: [
+                  const SizedBox(height: 5),
+                  Text('Confirm Account', style: textStyles.titleLarge),
+                  const SizedBox(height: 20),
+                  CustomTextFormField(
+                    label: 'Username',
+                    keyboardType: TextInputType.emailAddress,
+                    onChanged:
+                        ref.read(loginFormProvider.notifier).onUsernameChange,
+                    errorMessage: loginForm.isFormPosted
+                        ? loginForm.username.errorMessage
+                        : null,
+                  ),
+                  const SizedBox(height: 20),
+                  CustomTextFormField(
+                    label: 'Insert you password',
+                    obscureText: true,
+                    onChanged:
+                        ref.read(loginFormProvider.notifier).onPasswordChanged,
+                    errorMessage: loginForm.isFormPosted
+                        ? loginForm.password.errorMessage
+                        : null,
+                  ),
+                  const SizedBox(height: 20),
+                  SizedBox(
+                      width: double.infinity,
+                      height: 55,
+                      child: CustomFilledButton(
+                          text: 'Sign in',
+                          buttonColor: Colors.black,
+                          onPressed: loginForm.isPosting
+                              ? null
+                              : ref
+                                  .read(loginFormProvider.notifier)
+                                  .onFormSubmittedBiometric
+                          )),
+                  const Spacer(flex: 2),
+                ],
+              ),
+            ),
+          ),
+        ));
+  }
+}
diff --git a/lib/features/shared/widgets/custom_filled_button.dart b/lib/features/shared/widgets/custom_filled_button.dart
index cedde4e..4d9d9cc 100644
--- a/lib/features/shared/widgets/custom_filled_button.dart
+++ b/lib/features/shared/widgets/custom_filled_button.dart
@@ -1,37 +1,41 @@
 import 'package:flutter/material.dart';
 
 class CustomFilledButton extends StatelessWidget {
-
   final void Function()? onPressed;
   final String text;
   final Color? buttonColor;
+  final IconData? icon;
 
-  const CustomFilledButton({
-    super.key, 
-    this.onPressed, 
-    required this.text, 
-    this.buttonColor
-  });
+  const CustomFilledButton(
+      {super.key,
+      this.onPressed,
+      required this.text,
+      this.buttonColor,
+      this.icon});
 
   @override
   Widget build(BuildContext context) {
-
     const radius = Radius.circular(10);
 
     return FilledButton(
-      style: FilledButton.styleFrom(
-        backgroundColor: buttonColor,
-        shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(
-          bottomLeft: radius,
-          bottomRight: radius,
-          topLeft: radius,
-        )
-      )),
-        
-  
-      onPressed: onPressed, 
-      child: Text(text)
-    );
+        style: FilledButton.styleFrom(
+            backgroundColor: buttonColor,
+            shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.only(
+              bottomLeft: radius,
+              bottomRight: radius,
+              topLeft: radius,
+            ))),
+        onPressed: onPressed,
+        child: Row(
+            mainAxisAlignment: icon != null
+                ? MainAxisAlignment.spaceBetween
+                : MainAxisAlignment
+                    .center, //Alineado
+            children: <Widget>[
+              Text(text),
+              if (icon != null)
+                Icon(icon), //TODO: Icon passed as parameter
+            ]));
   }
-}
\ No newline at end of file
+}
diff --git a/lib/features/shared/widgets/side_menu.dart b/lib/features/shared/widgets/side_menu.dart
index cfb0189..4880433 100644
--- a/lib/features/shared/widgets/side_menu.dart
+++ b/lib/features/shared/widgets/side_menu.dart
@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:login_mobile/config/config.dart';
 import 'package:login_mobile/features/auth/presentation/providers/auth_provider.dart';
 import 'package:login_mobile/features/shared/shared.dart';
+import 'package:login_mobile/features/shared/widgets/bottom_sheet.dart';
 
 class SideMenu extends ConsumerStatefulWidget {
   final GlobalKey<ScaffoldState> scaffoldKey;
@@ -19,57 +20,98 @@ class SideMenu extends ConsumerStatefulWidget {
 class SideMenuState extends ConsumerState<SideMenu> {
   int navDrawerIndex = 0;
 
+  Future<void> handleBiometricAuthentication(context) async {
+    bool authenticated =
+        await ref.read(authProvider.notifier).authWithBiometrics();
+    if (authenticated) {
+      showModalBottomSheet(
+        isScrollControlled: true,
+        context: context,
+        builder: (context) => const CustomLogin(),
+      );
+      //final goRouter = ref.read(goRouterProvider);
+      //goRouter.go(
+      //    '/');
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final hasNotch = MediaQuery.of(context).viewPadding.top > 35;
     final textStyles = Theme.of(context).textTheme;
+    final authState = ref.watch(authProvider);
 
     return NavigationDrawer(
-        elevation: 1,
-        selectedIndex: navDrawerIndex,
-        onDestinationSelected: (value) {
-          setState(() {
-            navDrawerIndex = value;
-          });
-          final goRouter = ref.read(goRouterProvider);
-          if (value == 0) {
-            goRouter.go('/');
-          } else if (value == 1) {
-            goRouter.go('/storage');
-          }
-          // final menuItem = appMenuItems[value];
-          // context.push( menuItem.link );
-          widget.scaffoldKey.currentState?.closeDrawer();
-        },
-        children: [
-          Padding(
-            padding: EdgeInsets.fromLTRB(20, hasNotch ? 0 : 20, 16, 0),
-            child: Text('Your CapyFile', style: textStyles.titleMedium),
-          ),
-          Padding(
-            padding: const EdgeInsets.fromLTRB(20, 0, 16, 10),
-            child: Text('Tony Stark', style: textStyles.titleSmall),
-          ),
-          const NavigationDrawerDestination(
-              icon: Icon(Icons.folder), label: Text('Files')),
-          const NavigationDrawerDestination(
-              icon: Icon(Icons.storage_outlined), label: Text('Storage')),
-          const Padding(
-            padding: EdgeInsets.fromLTRB(28, 16, 28, 10),
-            child: Divider(),
-          ),
-          const Padding(
-            padding: EdgeInsets.fromLTRB(28, 10, 16, 10),
-            child: Text('Other options'),
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 20),
-            child: CustomFilledButton(
-                onPressed: () {
-                  ref.read(authProvider.notifier).logout();
-                },
-                text: 'Log out'),
+      elevation: 1,
+      selectedIndex: navDrawerIndex,
+      onDestinationSelected: (value) {
+        setState(() {
+          navDrawerIndex = value;
+        });
+        final goRouter = ref.read(goRouterProvider);
+        if (value == 0) {
+          goRouter.go('/');
+        } else if (value == 1) {
+          goRouter.go('/storage');
+        }
+        widget.scaffoldKey.currentState?.closeDrawer();
+      },
+      children: [
+        Padding(
+          padding: EdgeInsets.fromLTRB(20, hasNotch ? 0 : 20, 16, 0),
+          child: Text('Your CapyFile', style: textStyles.titleMedium),
+        ),
+        Padding(
+          padding: const EdgeInsets.fromLTRB(20, 0, 16, 10),
+          child: Text('Tony Stark', style: textStyles.titleSmall),
+        ),
+        const NavigationDrawerDestination(
+          icon: Icon(Icons.folder),
+          label: Text('Files'),
+        ),
+        const NavigationDrawerDestination(
+          icon: Icon(Icons.storage_outlined),
+          label: Text('Storage'),
+        ),
+        const Padding(
+          padding: EdgeInsets.fromLTRB(28, 16, 28, 10),
+          child: Divider(),
+        ),
+        const Padding(
+          padding: EdgeInsets.fromLTRB(28, 10, 16, 10),
+          child: Text('Other options'),
+        ),
+        authState.hasBiometric == true
+            ? Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: CustomFilledButton(
+                  onPressed: () {
+                    ref.read(authProvider.notifier).disableBiometric(ref);
+                  },
+                  text: 'Disable Biometrics',
+                  icon: Icons.cancel,
+                ),
+              )
+            : Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: CustomFilledButton(
+                  onPressed: () {
+                    handleBiometricAuthentication(context);
+                  },
+                  text: 'Biometrics',
+                  icon: Icons.fingerprint,
+                ),
+              ),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 20),
+          child: CustomFilledButton(
+            onPressed: () {
+              ref.read(authProvider.notifier).logout();
+            },
+            text: 'Log out',
           ),
-        ]);
+        ),
+      ],
+    );
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index ccc34c1..60b7e83 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   crypto:
     dependency: transitive
     description:
@@ -110,6 +110,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.16"
   flutter_riverpod:
     dependency: "direct main"
     description:
@@ -128,6 +136,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  fluttertoast:
+    dependency: "direct main"
+    description:
+      name: fluttertoast
+      sha256: "474f7d506230897a3cd28c965ec21c5328ae5605fc9c400cd330e9e9d6ac175c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.2"
   formz:
     dependency: "direct main"
     description:
@@ -168,14 +184,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  js:
+  intl:
     dependency: transitive
     description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      name: intl
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.18.1"
   lints:
     dependency: transitive
     description:
@@ -184,6 +200,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  local_auth:
+    dependency: "direct main"
+    description:
+      name: local_auth
+      sha256: "7e6c63082e399b61e4af71266b012e767a5d4525dd6e9ba41e174fd42d76e115"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.7"
+  local_auth_android:
+    dependency: transitive
+    description:
+      name: local_auth_android
+      sha256: "9ad0b1ffa6f04f4d91e38c2d4c5046583e23f4cae8345776a994e8670df57fb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.34"
+  local_auth_ios:
+    dependency: transitive
+    description:
+      name: local_auth_ios
+      sha256: "26a8d1ad0b4ef6f861d29921be8383000fda952e323a5b6752cf82ca9cf9a7a9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  local_auth_platform_interface:
+    dependency: transitive
+    description:
+      name: local_auth_platform_interface
+      sha256: fc5bd537970a324260fda506cfb61b33ad7426f37a8ea5c461cf612161ebba54
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  local_auth_windows:
+    dependency: transitive
+    description:
+      name: local_auth_windows
+      sha256: "505ba3367ca781efb1c50d3132e44a2446bccc4163427bc203b9b4d8994d97ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.10"
   logging:
     dependency: transitive
     description:
@@ -196,26 +252,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "586678f20e112219ed0f73215f01bcdf1d769824ba2ebae45ad918a9bfde9bdb"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   path:
     dependency: transitive
     description:
@@ -369,10 +425,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
@@ -385,10 +441,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -409,10 +465,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.2"
+    version: "0.6.1"
   typed_data:
     dependency: transitive
     description:
@@ -429,6 +485,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: ccbbfbf29732ee1b391c4c6d13e7032d851f675f47365e81904e4c6fd669c854
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2-beta"
   win32:
     dependency: transitive
     description:
@@ -446,5 +510,5 @@ packages:
     source: hosted
     version: "1.0.2"
 sdks:
-  dart: ">=3.1.0-35.0.dev <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.10.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 0c5a5ca..778c8a3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,9 +34,11 @@ dependencies:
     sdk: flutter
   flutter_dotenv: ^5.1.0
   flutter_riverpod: ^2.3.7
+  fluttertoast: ^8.2.2
   formz: ^0.6.0
   go_router: ^10.1.0
   google_fonts: ^5.1.0
+  local_auth: ^2.1.7
   shared_preferences: ^2.2.0
 
 dev_dependencies:
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 8b6d468..7407ddd 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <local_auth_windows/local_auth_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  LocalAuthPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("LocalAuthPlugin"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index b93c4c3..ef187dc 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  local_auth_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST