diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 0000000..fa0b357
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
new file mode 100644
index 0000000..d5e6ab1
--- /dev/null
+++ b/ios/Podfile.lock
@@ -0,0 +1,23 @@
+PODS:
+  - Flutter (1.0.0)
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+
+SPEC CHECKSUMS:
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+
+PODFILE CHECKSUM: 4305caec6b40dde0ae97be1573c53de1882a07e5
+
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 15cada4..e3773d4 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -54,6 +55,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/lib/features/todo/data/datasources/todo_remote_datasource.dart b/lib/features/todo/data/datasources/todo_remote_datasource.dart
index 8c3ef0b..9514543 100644
--- a/lib/features/todo/data/datasources/todo_remote_datasource.dart
+++ b/lib/features/todo/data/datasources/todo_remote_datasource.dart
@@ -10,8 +10,7 @@ import '../models/todo_dto.dart';
 @injectable
 class TodoRemoteDataSource {
   final http.Client _client;
-  // TODO: Replace this with the URL we provide you
-  final String baseUrl = 'https://6825aa0f0f0188d7e72ddd9a.mockapi.io/api/v1';
+  final String baseUrl = 'https://68346df6464b49963602cb3b.mockapi.io';
 
   TodoRemoteDataSource(this._client);
 
@@ -32,9 +31,20 @@ class TodoRemoteDataSource {
     }
   }
 
-  Future<TodoDTO> addTodo(String title) async {
+  Future<TodoDTO> addTodo(String title, String? description, String? imageUrl) async {
     try {
-      final newTodo = {'title': title, 'createdAtSeconds': DateTime.now().millisecondsSinceEpoch ~/ 1000};
+      final newTodo = {
+        'title': title,
+        'createdAtSeconds': DateTime.now().millisecondsSinceEpoch ~/ 1000
+      };
+
+      if (description != null) {
+        newTodo.addAll({'description': description});
+      }
+      
+      if (imageUrl != null) {
+        newTodo.addAll({'imageUrl': imageUrl});
+      }
 
       log('Sending todo: ${json.encode(newTodo)}');
 
@@ -61,6 +71,34 @@ class TodoRemoteDataSource {
     }
   }
 
+  Future<TodoDTO> updateTodo(String id, bool isDone) async {
+    try {
+      final updatedTodo = {'id': id, 'isDone': isDone};
+
+      log('Sending todo: ${json.encode(updatedTodo)}');
+
+      final response = await _client.patch(
+        Uri.parse('$baseUrl/todo/$id'),
+        headers: {'Content-Type': 'application/json'},
+        body: json.encode({'id': id, 'isDone': isDone}),
+      );
+
+      log('Response status: ${response.statusCode}');
+      log('Response body: ${response.body}');
+
+      if (response.statusCode == 201 || response.statusCode == 200) {
+        final Map<String, dynamic> responseData = json.decode(response.body);
+
+        return TodoDTO.fromJson(responseData);
+      } else {
+        throw Exception('Failed to create todo: ${response.statusCode}');
+      }
+    } catch (e) {
+      log('Error adding todo: $e');
+      throw Exception('Failed to create todo: $e');
+    }
+  }
+
   // For local client-side ID generation
   String generateId() {
     return const Uuid().v4();
diff --git a/lib/features/todo/data/models/todo_dto.dart b/lib/features/todo/data/models/todo_dto.dart
index 8d9d649..88d9ff1 100644
--- a/lib/features/todo/data/models/todo_dto.dart
+++ b/lib/features/todo/data/models/todo_dto.dart
@@ -10,6 +10,9 @@ class TodoDTO with _$TodoDTO {
   const factory TodoDTO({
     required String id,
     required String title,
+    required bool isDone,
+    String? description,
+    String? imageUrl,
     int? createdAtSeconds,
   }) = _TodoDTO;
 
diff --git a/lib/features/todo/data/models/todo_dto.freezed.dart b/lib/features/todo/data/models/todo_dto.freezed.dart
index 752b03e..21e96b2 100644
--- a/lib/features/todo/data/models/todo_dto.freezed.dart
+++ b/lib/features/todo/data/models/todo_dto.freezed.dart
@@ -23,6 +23,9 @@ TodoDTO _$TodoDTOFromJson(Map<String, dynamic> json) {
 mixin _$TodoDTO {
   String get id => throw _privateConstructorUsedError;
   String get title => throw _privateConstructorUsedError;
+  bool get isDone => throw _privateConstructorUsedError;
+  String? get description => throw _privateConstructorUsedError;
+  String? get imageUrl => throw _privateConstructorUsedError;
   int? get createdAtSeconds => throw _privateConstructorUsedError;
 
   /// Serializes this TodoDTO to a JSON map.
@@ -39,7 +42,14 @@ abstract class $TodoDTOCopyWith<$Res> {
   factory $TodoDTOCopyWith(TodoDTO value, $Res Function(TodoDTO) then) =
       _$TodoDTOCopyWithImpl<$Res, TodoDTO>;
   @useResult
-  $Res call({String id, String title, int? createdAtSeconds});
+  $Res call({
+    String id,
+    String title,
+    bool isDone,
+    String? description,
+    String? imageUrl,
+    int? createdAtSeconds,
+  });
 }
 
 /// @nodoc
@@ -59,6 +69,9 @@ class _$TodoDTOCopyWithImpl<$Res, $Val extends TodoDTO>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? isDone = null,
+    Object? description = freezed,
+    Object? imageUrl = freezed,
     Object? createdAtSeconds = freezed,
   }) {
     return _then(
@@ -73,6 +86,21 @@ class _$TodoDTOCopyWithImpl<$Res, $Val extends TodoDTO>
                     ? _value.title
                     : title // ignore: cast_nullable_to_non_nullable
                         as String,
+            isDone:
+                null == isDone
+                    ? _value.isDone
+                    : isDone // ignore: cast_nullable_to_non_nullable
+                        as bool,
+            description:
+                freezed == description
+                    ? _value.description
+                    : description // ignore: cast_nullable_to_non_nullable
+                        as String?,
+            imageUrl:
+                freezed == imageUrl
+                    ? _value.imageUrl
+                    : imageUrl // ignore: cast_nullable_to_non_nullable
+                        as String?,
             createdAtSeconds:
                 freezed == createdAtSeconds
                     ? _value.createdAtSeconds
@@ -92,7 +120,14 @@ abstract class _$$TodoDTOImplCopyWith<$Res> implements $TodoDTOCopyWith<$Res> {
   ) = __$$TodoDTOImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String id, String title, int? createdAtSeconds});
+  $Res call({
+    String id,
+    String title,
+    bool isDone,
+    String? description,
+    String? imageUrl,
+    int? createdAtSeconds,
+  });
 }
 
 /// @nodoc
@@ -111,6 +146,9 @@ class __$$TodoDTOImplCopyWithImpl<$Res>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? isDone = null,
+    Object? description = freezed,
+    Object? imageUrl = freezed,
     Object? createdAtSeconds = freezed,
   }) {
     return _then(
@@ -125,6 +163,21 @@ class __$$TodoDTOImplCopyWithImpl<$Res>
                 ? _value.title
                 : title // ignore: cast_nullable_to_non_nullable
                     as String,
+        isDone:
+            null == isDone
+                ? _value.isDone
+                : isDone // ignore: cast_nullable_to_non_nullable
+                    as bool,
+        description:
+            freezed == description
+                ? _value.description
+                : description // ignore: cast_nullable_to_non_nullable
+                    as String?,
+        imageUrl:
+            freezed == imageUrl
+                ? _value.imageUrl
+                : imageUrl // ignore: cast_nullable_to_non_nullable
+                    as String?,
         createdAtSeconds:
             freezed == createdAtSeconds
                 ? _value.createdAtSeconds
@@ -141,6 +194,9 @@ class _$TodoDTOImpl extends _TodoDTO {
   const _$TodoDTOImpl({
     required this.id,
     required this.title,
+    required this.isDone,
+    this.description,
+    this.imageUrl,
     this.createdAtSeconds,
   }) : super._();
 
@@ -152,11 +208,17 @@ class _$TodoDTOImpl extends _TodoDTO {
   @override
   final String title;
   @override
+  final bool isDone;
+  @override
+  final String? description;
+  @override
+  final String? imageUrl;
+  @override
   final int? createdAtSeconds;
 
   @override
   String toString() {
-    return 'TodoDTO(id: $id, title: $title, createdAtSeconds: $createdAtSeconds)';
+    return 'TodoDTO(id: $id, title: $title, isDone: $isDone, description: $description, imageUrl: $imageUrl, createdAtSeconds: $createdAtSeconds)';
   }
 
   @override
@@ -166,13 +228,26 @@ class _$TodoDTOImpl extends _TodoDTO {
             other is _$TodoDTOImpl &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.title, title) || other.title == title) &&
+            (identical(other.isDone, isDone) || other.isDone == isDone) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.imageUrl, imageUrl) ||
+                other.imageUrl == imageUrl) &&
             (identical(other.createdAtSeconds, createdAtSeconds) ||
                 other.createdAtSeconds == createdAtSeconds));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, title, createdAtSeconds);
+  int get hashCode => Object.hash(
+    runtimeType,
+    id,
+    title,
+    isDone,
+    description,
+    imageUrl,
+    createdAtSeconds,
+  );
 
   /// Create a copy of TodoDTO
   /// with the given fields replaced by the non-null parameter values.
@@ -192,6 +267,9 @@ abstract class _TodoDTO extends TodoDTO {
   const factory _TodoDTO({
     required final String id,
     required final String title,
+    required final bool isDone,
+    final String? description,
+    final String? imageUrl,
     final int? createdAtSeconds,
   }) = _$TodoDTOImpl;
   const _TodoDTO._() : super._();
@@ -203,6 +281,12 @@ abstract class _TodoDTO extends TodoDTO {
   @override
   String get title;
   @override
+  bool get isDone;
+  @override
+  String? get description;
+  @override
+  String? get imageUrl;
+  @override
   int? get createdAtSeconds;
 
   /// Create a copy of TodoDTO
diff --git a/lib/features/todo/data/models/todo_dto.g.dart b/lib/features/todo/data/models/todo_dto.g.dart
index bada3c6..659ddc6 100644
--- a/lib/features/todo/data/models/todo_dto.g.dart
+++ b/lib/features/todo/data/models/todo_dto.g.dart
@@ -10,6 +10,9 @@ _$TodoDTOImpl _$$TodoDTOImplFromJson(Map<String, dynamic> json) =>
     _$TodoDTOImpl(
       id: json['id'] as String,
       title: json['title'] as String,
+      isDone: json['isDone'] as bool,
+      description: json['description'] as String?,
+      imageUrl: json['imageUrl'] as String?,
       createdAtSeconds: (json['createdAtSeconds'] as num?)?.toInt(),
     );
 
@@ -17,5 +20,8 @@ Map<String, dynamic> _$$TodoDTOImplToJson(_$TodoDTOImpl instance) =>
     <String, dynamic>{
       'id': instance.id,
       'title': instance.title,
+      'isDone': instance.isDone,
+      'description': instance.description,
+      'imageUrl': instance.imageUrl,
       'createdAtSeconds': instance.createdAtSeconds,
     };
diff --git a/lib/features/todo/data/repositories/todo_repository.dart b/lib/features/todo/data/repositories/todo_repository.dart
index 49e63b0..52be3dc 100644
--- a/lib/features/todo/data/repositories/todo_repository.dart
+++ b/lib/features/todo/data/repositories/todo_repository.dart
@@ -1,6 +1,7 @@
 import 'dart:developer';
 
 import 'package:injectable/injectable.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';
 
 import '../../domain/models/todo_model.dart';
@@ -10,6 +11,8 @@ import '../models/todo_dto.dart';
 @injectable
 class TodoRepository {
   final TodoRemoteDataSource remoteDataSource;
+  static const String _favouritePrefix = 'favourite_';
+  static const String _favouritesList = 'favourites_list';
 
   TodoRepository(this.remoteDataSource);
 
@@ -34,15 +37,54 @@ class TodoRepository {
   }
 
   // Add a new todo remotely
-  Future<void> addTodo(String title) async {
+  Future<void> addTodo(String title, String? description, String? imageUrl) async {
     try {
       // Add todo remotely
-      await remoteDataSource.addTodo(title);
+      await remoteDataSource.addTodo(title, description, imageUrl);
     } catch (e) {
       log('Error adding remote todo: $e');
     }
   }
 
+  Future<void> updateTodo(String id, bool isDone) async {
+    try {
+      await remoteDataSource.updateTodo(id, isDone);
+    } catch (e) {
+      log('update todo [id:$id] [isDone:$isDone], : $e');
+    }
+  }
+
+  Future<Set<String>> getFavouriteIds() async {
+    final prefs = await SharedPreferences.getInstance();
+    final favouritesList = prefs.getStringList(_favouritesList) ?? [];
+    return Set<String>.from(favouritesList);
+  }
+
+  Future<void> addFavourite(String todoId) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('$_favouritePrefix$todoId', true);
+
+    final favouritesList = prefs.getStringList(_favouritesList) ?? [];
+    if (!favouritesList.contains(todoId)) {
+      favouritesList.add(todoId);
+      await prefs.setStringList(_favouritesList, favouritesList);
+    }
+  }
+
+  Future<void> removeFavourite(String todoId) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove('$_favouritePrefix$todoId');
+
+    final favouritesList = prefs.getStringList(_favouritesList) ?? [];
+    favouritesList.remove(todoId);
+    await prefs.setStringList(_favouritesList, favouritesList);
+  }
+
+  Future<bool> isFavourite(String todoId) async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getBool('$_favouritePrefix$todoId') ?? false;
+  }
+
   // Helper method to map DTOs to domain models
   TodoModel _mapDtoToModel(TodoDTO dto) {
     try {
@@ -51,10 +93,10 @@ class TodoRepository {
         createdAt = DateTime.fromMillisecondsSinceEpoch(dto.createdAtSeconds! * 1000);
       }
 
-      return TodoModel(id: dto.id, title: dto.title, createdAt: createdAt);
+      return TodoModel(id: dto.id, title: dto.title, isDone: dto.isDone, description: dto.description, imageUrl: dto.imageUrl, createdAt: createdAt);
     } catch (e) {
       log('Error mapping DTO to model: $e');
-      return TodoModel(id: const Uuid().v4(), title: 'Unknown title', createdAt: DateTime.now());
+      return TodoModel(id: const Uuid().v4(), title: 'Unknown title', isDone: false, createdAt: DateTime.now());
     }
   }
 }
diff --git a/lib/features/todo/domain/models/todo_model.dart b/lib/features/todo/domain/models/todo_model.dart
index 606a711..069082f 100644
--- a/lib/features/todo/domain/models/todo_model.dart
+++ b/lib/features/todo/domain/models/todo_model.dart
@@ -8,7 +8,14 @@ part 'todo_model.g.dart';
 class TodoModel with _$TodoModel {
   const TodoModel._();
 
-  const factory TodoModel({required String id, required String title, DateTime? createdAt}) =
+  const factory TodoModel({
+    required String id,
+    required String title,
+    required bool isDone,
+    String? description,
+    String? imageUrl,
+    DateTime? createdAt,
+  }) =
       _TodoModel;
 
   DateTime get effectiveCreatedAt => createdAt ?? DateTime.now();
diff --git a/lib/features/todo/domain/models/todo_model.freezed.dart b/lib/features/todo/domain/models/todo_model.freezed.dart
index 6052b7a..7582ab1 100644
--- a/lib/features/todo/domain/models/todo_model.freezed.dart
+++ b/lib/features/todo/domain/models/todo_model.freezed.dart
@@ -23,6 +23,9 @@ TodoModel _$TodoModelFromJson(Map<String, dynamic> json) {
 mixin _$TodoModel {
   String get id => throw _privateConstructorUsedError;
   String get title => throw _privateConstructorUsedError;
+  bool get isDone => throw _privateConstructorUsedError;
+  String? get description => throw _privateConstructorUsedError;
+  String? get imageUrl => throw _privateConstructorUsedError;
   DateTime? get createdAt => throw _privateConstructorUsedError;
 
   /// Serializes this TodoModel to a JSON map.
@@ -40,7 +43,14 @@ abstract class $TodoModelCopyWith<$Res> {
   factory $TodoModelCopyWith(TodoModel value, $Res Function(TodoModel) then) =
       _$TodoModelCopyWithImpl<$Res, TodoModel>;
   @useResult
-  $Res call({String id, String title, DateTime? createdAt});
+  $Res call({
+    String id,
+    String title,
+    bool isDone,
+    String? description,
+    String? imageUrl,
+    DateTime? createdAt,
+  });
 }
 
 /// @nodoc
@@ -60,6 +70,9 @@ class _$TodoModelCopyWithImpl<$Res, $Val extends TodoModel>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? isDone = null,
+    Object? description = freezed,
+    Object? imageUrl = freezed,
     Object? createdAt = freezed,
   }) {
     return _then(
@@ -74,6 +87,21 @@ class _$TodoModelCopyWithImpl<$Res, $Val extends TodoModel>
                     ? _value.title
                     : title // ignore: cast_nullable_to_non_nullable
                         as String,
+            isDone:
+                null == isDone
+                    ? _value.isDone
+                    : isDone // ignore: cast_nullable_to_non_nullable
+                        as bool,
+            description:
+                freezed == description
+                    ? _value.description
+                    : description // ignore: cast_nullable_to_non_nullable
+                        as String?,
+            imageUrl:
+                freezed == imageUrl
+                    ? _value.imageUrl
+                    : imageUrl // ignore: cast_nullable_to_non_nullable
+                        as String?,
             createdAt:
                 freezed == createdAt
                     ? _value.createdAt
@@ -94,7 +122,14 @@ abstract class _$$TodoModelImplCopyWith<$Res>
   ) = __$$TodoModelImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String id, String title, DateTime? createdAt});
+  $Res call({
+    String id,
+    String title,
+    bool isDone,
+    String? description,
+    String? imageUrl,
+    DateTime? createdAt,
+  });
 }
 
 /// @nodoc
@@ -113,6 +148,9 @@ class __$$TodoModelImplCopyWithImpl<$Res>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? isDone = null,
+    Object? description = freezed,
+    Object? imageUrl = freezed,
     Object? createdAt = freezed,
   }) {
     return _then(
@@ -127,6 +165,21 @@ class __$$TodoModelImplCopyWithImpl<$Res>
                 ? _value.title
                 : title // ignore: cast_nullable_to_non_nullable
                     as String,
+        isDone:
+            null == isDone
+                ? _value.isDone
+                : isDone // ignore: cast_nullable_to_non_nullable
+                    as bool,
+        description:
+            freezed == description
+                ? _value.description
+                : description // ignore: cast_nullable_to_non_nullable
+                    as String?,
+        imageUrl:
+            freezed == imageUrl
+                ? _value.imageUrl
+                : imageUrl // ignore: cast_nullable_to_non_nullable
+                    as String?,
         createdAt:
             freezed == createdAt
                 ? _value.createdAt
@@ -140,8 +193,14 @@ class __$$TodoModelImplCopyWithImpl<$Res>
 /// @nodoc
 @JsonSerializable()
 class _$TodoModelImpl extends _TodoModel {
-  const _$TodoModelImpl({required this.id, required this.title, this.createdAt})
-    : super._();
+  const _$TodoModelImpl({
+    required this.id,
+    required this.title,
+    required this.isDone,
+    this.description,
+    this.imageUrl,
+    this.createdAt,
+  }) : super._();
 
   factory _$TodoModelImpl.fromJson(Map<String, dynamic> json) =>
       _$$TodoModelImplFromJson(json);
@@ -151,11 +210,17 @@ class _$TodoModelImpl extends _TodoModel {
   @override
   final String title;
   @override
+  final bool isDone;
+  @override
+  final String? description;
+  @override
+  final String? imageUrl;
+  @override
   final DateTime? createdAt;
 
   @override
   String toString() {
-    return 'TodoModel(id: $id, title: $title, createdAt: $createdAt)';
+    return 'TodoModel(id: $id, title: $title, isDone: $isDone, description: $description, imageUrl: $imageUrl, createdAt: $createdAt)';
   }
 
   @override
@@ -165,13 +230,26 @@ class _$TodoModelImpl extends _TodoModel {
             other is _$TodoModelImpl &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.title, title) || other.title == title) &&
+            (identical(other.isDone, isDone) || other.isDone == isDone) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.imageUrl, imageUrl) ||
+                other.imageUrl == imageUrl) &&
             (identical(other.createdAt, createdAt) ||
                 other.createdAt == createdAt));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, title, createdAt);
+  int get hashCode => Object.hash(
+    runtimeType,
+    id,
+    title,
+    isDone,
+    description,
+    imageUrl,
+    createdAt,
+  );
 
   /// Create a copy of TodoModel
   /// with the given fields replaced by the non-null parameter values.
@@ -191,6 +269,9 @@ abstract class _TodoModel extends TodoModel {
   const factory _TodoModel({
     required final String id,
     required final String title,
+    required final bool isDone,
+    final String? description,
+    final String? imageUrl,
     final DateTime? createdAt,
   }) = _$TodoModelImpl;
   const _TodoModel._() : super._();
@@ -203,6 +284,12 @@ abstract class _TodoModel extends TodoModel {
   @override
   String get title;
   @override
+  bool get isDone;
+  @override
+  String? get description;
+  @override
+  String? get imageUrl;
+  @override
   DateTime? get createdAt;
 
   /// Create a copy of TodoModel
diff --git a/lib/features/todo/domain/models/todo_model.g.dart b/lib/features/todo/domain/models/todo_model.g.dart
index 6512f96..2a93162 100644
--- a/lib/features/todo/domain/models/todo_model.g.dart
+++ b/lib/features/todo/domain/models/todo_model.g.dart
@@ -10,6 +10,9 @@ _$TodoModelImpl _$$TodoModelImplFromJson(Map<String, dynamic> json) =>
     _$TodoModelImpl(
       id: json['id'] as String,
       title: json['title'] as String,
+      isDone: json['isDone'] as bool,
+      description: json['description'] as String?,
+      imageUrl: json['imageUrl'] as String?,
       createdAt:
           json['createdAt'] == null
               ? null
@@ -20,5 +23,8 @@ Map<String, dynamic> _$$TodoModelImplToJson(_$TodoModelImpl instance) =>
     <String, dynamic>{
       'id': instance.id,
       'title': instance.title,
+      'isDone': instance.isDone,
+      'description': instance.description,
+      'imageUrl': instance.imageUrl,
       'createdAt': instance.createdAt?.toIso8601String(),
     };
diff --git a/lib/features/todo/presentation/cubits/todo_cubit.dart b/lib/features/todo/presentation/cubits/todo_cubit.dart
index f1805f4..ed1dfd5 100644
--- a/lib/features/todo/presentation/cubits/todo_cubit.dart
+++ b/lib/features/todo/presentation/cubits/todo_cubit.dart
@@ -15,19 +15,77 @@ class TodoCubit extends Cubit<TodoState> {
     try {
       emit(TodosLoading());
       final todos = await _repository.getTodos();
-      emit(TodosLoaded(todos: todos));
+      final favouriteIds = await _repository.getFavouriteIds();
+
+      emit(TodosLoaded(todos: todos, favouriteIds: favouriteIds));
     } catch (e) {
       emit(TodosError(message: e.toString()));
     }
   }
 
-  Future<void> addTodo(String title) async {
+  Future<void> addTodo(String title, String? description, String? imageUrl) async {
     try {
       emit(TodosLoading());
-      await _repository.addTodo(title);
+      await _repository.addTodo(title, description, imageUrl);
       await loadTodos();
     } catch (e) {
       emit(TodosError(message: e.toString()));
     }
   }
+
+  Future<void> toggleTodo(String id, bool isDone) async {
+    try {
+      // Optimistic update - update UI immediately
+      if (state is TodosLoaded) {
+        final currentTodos = (state as TodosLoaded).todos;
+        final favouriteTodos = (state as TodosLoaded).favouriteIds;
+        final updatedTodos = currentTodos.map((todo) {
+          if (todo.id == id) {
+            return todo.copyWith(isDone: isDone);
+          }
+          return todo;
+        }).toList();
+        emit(TodosLoaded(todos: updatedTodos, favouriteIds: favouriteTodos));
+      }
+
+      // Make API call
+      await _repository.updateTodo(id, isDone);
+
+      // Refresh from server to ensure consistency
+      await loadTodos();
+    } catch (e) {
+      // Revert optimistic update on error
+      await loadTodos();
+      emit(TodosError(message: e.toString()));
+    }
+  }
+
+  Future<void> toggleFavourite(String todoId) async {
+    final currentState = state;
+    if (currentState is! TodosLoaded) return;
+
+    try {
+      final newFavouriteIds = Set<String>.from(currentState.favouriteIds);
+      if (newFavouriteIds.contains(todoId)) {
+        newFavouriteIds.remove(todoId);
+        await _repository.removeFavourite(todoId);
+      } else {
+        newFavouriteIds.add(todoId);
+        await _repository.addFavourite(todoId);
+      }
+
+      emit(TodosLoaded(todos: currentState.todos, favouriteIds: newFavouriteIds));
+    } catch (e) {
+      emit(TodosError(message: 'Failed to update favourite: $e'));
+      loadTodos();
+    }
+  }
+
+  bool isFavourite(String todoId) {
+    final currentState = state;
+    if (currentState is TodosLoaded) {
+      return currentState.favouriteIds.contains(todoId);
+    }
+    return false;
+  }
 }
diff --git a/lib/features/todo/presentation/cubits/todo_state.dart b/lib/features/todo/presentation/cubits/todo_state.dart
index e39b174..fa3c552 100644
--- a/lib/features/todo/presentation/cubits/todo_state.dart
+++ b/lib/features/todo/presentation/cubits/todo_state.dart
@@ -11,11 +11,15 @@ class TodosLoading extends TodoState {}
 
 class TodosLoaded extends TodoState {
   final List<TodoModel> todos;
+  final Set<String> favouriteIds;
 
-  const TodosLoaded({required this.todos});
+  const TodosLoaded({
+    required this.todos,
+    required this.favouriteIds,
+  });
 
   @override
-  List<Object> get props => [todos];
+  List<Object> get props => [todos, favouriteIds];
 }
 
 class TodosError extends TodoState {
diff --git a/lib/features/todo/presentation/screens/todo_form_screen.dart b/lib/features/todo/presentation/screens/todo_form_screen.dart
index cf54e93..38a9b5c 100644
--- a/lib/features/todo/presentation/screens/todo_form_screen.dart
+++ b/lib/features/todo/presentation/screens/todo_form_screen.dart
@@ -13,16 +13,24 @@ class TodoFormScreen extends StatefulWidget {
 class _TodoFormScreenState extends State<TodoFormScreen> {
   final _formKey = GlobalKey<FormState>();
   final _titleController = TextEditingController();
+  final _descriptionController = TextEditingController();
+  final _imageUrlController = TextEditingController();
 
   @override
   void dispose() {
     _titleController.dispose();
+    _descriptionController.dispose();
+    _imageUrlController.dispose();
     super.dispose();
   }
 
   void _submitForm() {
     if (_formKey.currentState?.validate() ?? false) {
-      context.read<TodoCubit>().addTodo(_titleController.text);
+      context.read<TodoCubit>().addTodo(
+          _titleController.text,
+          _descriptionController.text,
+          _imageUrlController.text,
+      );
       Navigator.pop(context);
     }
   }
@@ -36,12 +44,13 @@ class _TodoFormScreenState extends State<TodoFormScreen> {
         child: Form(
           key: _formKey,
           child: Column(
+            spacing: 10,
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 16),
               TextFormField(
                 controller: _titleController,
-                decoration: const InputDecoration(labelText: 'Title', border: OutlineInputBorder()),
+                decoration: _buildInputDecoration('Title', true),
                 validator: (value) {
                   if (value == null || value.isEmpty) {
                     return 'Please enter a title';
@@ -49,6 +58,16 @@ class _TodoFormScreenState extends State<TodoFormScreen> {
                   return null;
                 },
               ),
+              TextFormField(
+                controller: _descriptionController,
+                decoration: _buildInputDecoration('Description', false),
+                minLines: 4,
+                maxLines: 8,
+              ),
+              TextFormField(
+                controller: _imageUrlController,
+                decoration: _buildInputDecoration('Image URL', false),
+              ),
               const SizedBox(height: 24),
               ElevatedButton(
                 onPressed: _submitForm,
@@ -61,4 +80,11 @@ class _TodoFormScreenState extends State<TodoFormScreen> {
       ),
     );
   }
+
+  InputDecoration _buildInputDecoration(String labelText, bool? required) => InputDecoration(
+    suffixText: required! ? '*' : null,
+    labelStyle: required ? TextStyle(color: Colors.red) : null,
+    labelText: labelText,
+    border: OutlineInputBorder()
+  );
 }
diff --git a/lib/features/todo/presentation/screens/todo_list_screen.dart b/lib/features/todo/presentation/screens/todo_list_screen.dart
index a366ba1..c7e4d55 100644
--- a/lib/features/todo/presentation/screens/todo_list_screen.dart
+++ b/lib/features/todo/presentation/screens/todo_list_screen.dart
@@ -17,29 +17,10 @@ class TodoListScreen extends StatelessWidget {
       appBar: AppBar(title: const Text('Todo App')),
       body: BlocBuilder<TodoCubit, TodoState>(
         builder: (context, state) {
-          if (state is TodosLoading) {
-            return const Center(child: CircularProgressIndicator());
-          } else if (state is TodosLoaded) {
-            final todos = state.todos;
-
-            if (todos.isEmpty) {
-              return const Center(
-                child: Text(
-                  'No todos yet!\nTap the + button to add one.',
-                  textAlign: TextAlign.center,
-                  style: TextStyle(fontSize: 18),
-                ),
-              );
-            }
-
-            return ListView.builder(
-              itemCount: todos.length,
-              itemBuilder: (context, index) {
-                return TodoItem(todo: todos[index]);
-              },
-            );
-          } else if (state is TodosError) {
-            return Center(child: Text('Error: ${state.message}', style: const TextStyle(color: Colors.red)));
+          switch (state) {
+            case TodosLoading(): return _loadingScreen();
+            case TodosLoaded(): return _loadedScreen(state);
+            case TodosError(): return _errorScreen(state);
           }
 
           return const Center(child: Text('Unknown state'));
@@ -58,4 +39,40 @@ class TodoListScreen extends StatelessWidget {
       ),
     );
   }
+
+  Center _errorScreen(TodosError state) {
+    return Center(child: Text('Error: ${state.message}', style: const TextStyle(color: Colors.red)));
+  }
+
+  Widget _loadedScreen(TodosLoaded state) {
+    final todos = state.todos;
+
+    if (todos.isEmpty) {
+      return const Center(
+        child: Text(
+          'No todos yet!\nTap the + button to add one.',
+          textAlign: TextAlign.center,
+          style: TextStyle(fontSize: 18),
+        ),
+      );
+    }
+
+    return ListView.builder(
+      itemCount: todos.length,
+      itemBuilder: (context, index) {
+        return TodoItem(
+          todo: todos[index],
+          onToggle: (bool isDone) {
+            context.read<TodoCubit>().toggleTodo(todos[index].id, isDone);
+          },
+        );
+      },
+    );
+  }
+
+  Center _loadingScreen() {
+    return const Center(child: CircularProgressIndicator());
+  }
+
+
 }
diff --git a/lib/features/todo/presentation/widgets/todo_item.dart b/lib/features/todo/presentation/widgets/todo_item.dart
index 0930dea..766417e 100644
--- a/lib/features/todo/presentation/widgets/todo_item.dart
+++ b/lib/features/todo/presentation/widgets/todo_item.dart
@@ -1,31 +1,202 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../domain/models/todo_model.dart';
+import '../cubits/todo_cubit.dart';
 
 class TodoItem extends StatelessWidget {
   final TodoModel todo;
+  final ValueChanged<bool>? onToggle;
 
-  const TodoItem({super.key, required this.todo});
+  const TodoItem({
+    super.key,
+    required this.todo,
+    this.onToggle,
+  });
 
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      elevation: 2,
-      margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-      child: Padding(
-        padding: const EdgeInsets.all(12.0),
+  void _showContextMenu(BuildContext context) {
+    final cubit = context.read<TodoCubit>();
+    final isFavourite = cubit.isFavourite(todo.id);
+
+    showModalBottomSheet(
+      context: context,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+      ),
+      builder: (context) => Container(
+        padding: const EdgeInsets.all(16),
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
           children: [
-            Text(todo.title, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
-            const SizedBox(height: 4),
-            Text(
-              todo.formattedDate,
-              style: TextStyle(fontSize: 12, color: Colors.grey[600], fontStyle: FontStyle.italic),
+            Container(
+              width: 40,
+              height: 4,
+              margin: const EdgeInsets.only(bottom: 16),
+              decoration: BoxDecoration(
+                color: Colors.grey[300],
+                borderRadius: BorderRadius.circular(2),
+              ),
+            ),
+            ListTile(
+              leading: Icon(
+                isFavourite ? Icons.favorite : Icons.favorite_border,
+                color: isFavourite ? Colors.red : null,
+              ),
+              title: Text(isFavourite ? 'Remove from Favourites' : 'Add to Favourites'),
+              onTap: () {
+                Navigator.pop(context);
+                cubit.toggleFavourite(todo.id);
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                        isFavourite
+                            ? 'Removed from favourites'
+                            : 'Added to favourites'
+                    ),
+                    duration: const Duration(seconds: 2),
+                    behavior: SnackBarBehavior.floating,
+                    action: SnackBarAction(
+                      label: 'Undo',
+                      onPressed: () => cubit.toggleFavourite(todo.id),
+                    ),
+                  ),
+                );
+              },
             ),
           ],
         ),
       ),
     );
   }
-}
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<TodoCubit, TodoState>(
+      builder: (context, state) {
+        final isFavourite = state is TodosLoaded &&
+            state.favouriteIds.contains(todo.id);
+
+        return GestureDetector(
+          onLongPress: () => _showContextMenu(context),
+          child: Card(
+            elevation: 2,
+            margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            child: Padding(
+              padding: const EdgeInsets.all(12.0),
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Container(
+                    width: 60,
+                    height: 60,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(8),
+                      color: Colors.grey[300],
+                    ),
+                    clipBehavior: Clip.antiAlias,
+                    child: todo.imageUrl != null && todo.imageUrl!.isNotEmpty
+                        ? Image.network(
+                      todo.imageUrl!,
+                      fit: BoxFit.cover,
+                      errorBuilder: (context, error, stackTrace) {
+                        return Icon(
+                          Icons.image_not_supported,
+                          color: Colors.grey[600],
+                          size: 30,
+                        );
+                      },
+                      loadingBuilder: (context, child, loadingProgress) {
+                        if (loadingProgress == null) return child;
+                        return Center(
+                          child: CircularProgressIndicator(
+                            value: loadingProgress.expectedTotalBytes != null
+                                ? loadingProgress.cumulativeBytesLoaded /
+                                loadingProgress.expectedTotalBytes!
+                                : null,
+                            strokeWidth: 2,
+                          ),
+                        );
+                      },
+                    )
+                        : Icon(
+                      Icons.image,
+                      color: Colors.grey[600],
+                      size: 30,
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            if (isFavourite)
+                              const Icon(
+                                Icons.favorite,
+                                color: Colors.red,
+                                size: 16,
+                              ),
+                              const SizedBox(width: 4),
+                            Expanded(
+                              child: Text(
+                                todo.title,
+                                style: const TextStyle(
+                                  fontSize: 18,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 4),
+                        if (todo.description != null && todo.description!.isNotEmpty) ...[
+                          Text(
+                            todo.description!,
+                            style: const TextStyle(fontSize: 14),
+                            maxLines: 2,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                          const SizedBox(height: 4),
+                        ],
+                        Text(
+                          todo.formattedDate,
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Colors.grey[600],
+                            fontStyle: FontStyle.italic,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                  Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Switch(
+                          value: todo.isDone,
+                          onChanged: onToggle,
+                          activeColor: Colors.green,
+                          activeTrackColor: Colors.green.withValues(alpha: 0.3)
+                      ),
+                      Text(
+                        todo.isDone == true ? 'Done' : 'Todo',
+                        style: TextStyle(
+                          fontSize: 10,
+                          color: Colors.grey[600],
+                          fontWeight: FontWeight.w500,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 5daddc6..0e2f1f5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   bloc:
     dependency: transitive
     description:
@@ -197,10 +197,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -388,10 +388,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -753,10 +753,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
   watcher:
     dependency: transitive
     description: