diff --git a/.gitignore b/.gitignore
index 32e0c029..767de96c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,6 @@ Thumbs.db # Windows
 # Build and output directories
 /dist
 /build
-/out
\ No newline at end of file
+/out
+
+db.sqlite3
\ No newline at end of file
diff --git a/core/admin.py b/core/admin.py
index 8e640ecb..28513871 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from .models import FAQ
-from .models import Contact, SuccessStory, StoryReaction, Question, Answer, QuestionUpvote, AnswerUpvote
+from .models import Contact, SuccessStory, StoryReaction, Question, Answer, QuestionUpvote, AnswerUpvote,Goal,Milestone,StudySession,Achievement,UserStats,WeeklyGoal
 
 @admin.register(Contact)
 class ContactAdmin(admin.ModelAdmin):
@@ -140,4 +140,153 @@ def answer_author(self, obj):
 
 @admin.register(FAQ)
 class FAQAdmin(admin.ModelAdmin):
-    list_display = ('question', 'answer')
\ No newline at end of file
+    list_display = ('question', 'answer')
+
+# Add these admin configurations to your core/admin.py file
+
+@admin.register(Goal)
+class GoalAdmin(admin.ModelAdmin):
+    list_display = ('title', 'user', 'category', 'priority', 'status', 'progress_percentage', 'target_date', 'is_completed', 'created_at')
+    list_filter = ('category', 'priority', 'status', 'is_completed', 'created_at')
+    search_fields = ('title', 'description', 'user__username', 'user__first_name', 'user__last_name')
+    readonly_fields = ('created_at', 'updated_at', 'completed_at')
+    list_editable = ('status', 'progress_percentage')
+    ordering = ('-created_at',)
+    
+    fieldsets = (
+        ('Goal Information', {
+            'fields': ('user', 'title', 'description', 'category', 'priority')
+        }),
+        ('Progress', {
+            'fields': ('status', 'progress_percentage', 'is_completed', 'target_date')
+        }),
+        ('Timestamps', {
+            'fields': ('created_at', 'updated_at', 'completed_at'),
+            'classes': ('collapse',)
+        }),
+    )
+
+@admin.register(Milestone)
+class MilestoneAdmin(admin.ModelAdmin):
+    list_display = ('title', 'goal', 'goal_user', 'is_completed', 'due_date', 'created_at')
+    list_filter = ('is_completed', 'due_date', 'created_at')
+    search_fields = ('title', 'description', 'goal__title', 'goal__user__username')
+    readonly_fields = ('created_at', 'completed_at')
+    list_editable = ('is_completed',)
+    ordering = ('-created_at',)
+    
+    def goal_user(self, obj):
+        return obj.goal.user.username
+    goal_user.short_description = 'Goal Owner'
+    
+    fieldsets = (
+        ('Milestone Information', {
+            'fields': ('goal', 'title', 'description', 'due_date')
+        }),
+        ('Status', {
+            'fields': ('is_completed',)
+        }),
+        ('Timestamps', {
+            'fields': ('created_at', 'completed_at'),
+            'classes': ('collapse',)
+        }),
+    )
+
+@admin.register(StudySession)
+class StudySessionAdmin(admin.ModelAdmin):
+    list_display = ('title', 'user', 'subject', 'duration_minutes', 'productivity_rating', 'date', 'created_at')
+    list_filter = ('subject', 'date', 'productivity_rating', 'created_at')
+    search_fields = ('title', 'description', 'notes', 'user__username', 'user__first_name', 'user__last_name')
+    readonly_fields = ('created_at',)
+    ordering = ('-date', '-created_at')
+    
+    fieldsets = (
+        ('Session Information', {
+            'fields': ('user', 'subject', 'title', 'description', 'date')
+        }),
+        ('Performance', {
+            'fields': ('duration_minutes', 'productivity_rating')
+        }),
+        ('Additional', {
+            'fields': ('goals_related', 'notes'),
+            'classes': ('collapse',)
+        }),
+        ('Timestamps', {
+            'fields': ('created_at',),
+            'classes': ('collapse',)
+        }),
+    )
+
+@admin.register(Achievement)
+class AchievementAdmin(admin.ModelAdmin):
+    list_display = ('title', 'user', 'achievement_type', 'points', 'is_earned', 'earned_at')
+    list_filter = ('achievement_type', 'is_earned', 'earned_at')
+    search_fields = ('title', 'description', 'user__username', 'user__first_name', 'user__last_name')
+    readonly_fields = ('earned_at',)
+    list_editable = ('is_earned',)
+    ordering = ('-earned_at',)
+    
+    fieldsets = (
+        ('Achievement Information', {
+            'fields': ('user', 'title', 'description', 'achievement_type', 'icon')
+        }),
+        ('Rewards', {
+            'fields': ('points', 'is_earned', 'related_goal')
+        }),
+        ('Timestamps', {
+            'fields': ('earned_at',)
+        }),
+    )
+
+@admin.register(UserStats)
+class UserStatsAdmin(admin.ModelAdmin):
+    list_display = ('user', 'total_study_hours', 'total_goals_completed', 'current_streak_days', 'achievement_points', 'last_activity_date')
+    search_fields = ('user__username', 'user__first_name', 'user__last_name')
+    readonly_fields = ('created_at', 'updated_at')
+    ordering = ('-total_study_hours',)
+    
+    fieldsets = (
+        ('User', {
+            'fields': ('user',)
+        }),
+        ('Study Statistics', {
+            'fields': ('total_study_hours', 'current_streak_days', 'longest_streak_days', 'last_activity_date')
+        }),
+        ('Community Statistics', {
+            'fields': ('total_questions_asked', 'total_answers_given', 'total_success_stories')
+        }),
+        ('Achievements', {
+            'fields': ('total_goals_completed', 'achievement_points')
+        }),
+        ('Timestamps', {
+            'fields': ('created_at', 'updated_at'),
+            'classes': ('collapse',)
+        }),
+    )
+
+@admin.register(WeeklyGoal)
+class WeeklyGoalAdmin(admin.ModelAdmin):
+    list_display = ('user', 'week_start', 'target_study_hours', 'actual_study_hours', 'target_sessions', 'actual_sessions', 'progress_percentage', 'is_completed')
+    list_filter = ('week_start', 'is_completed', 'created_at')
+    search_fields = ('user__username', 'user__first_name', 'user__last_name')
+    readonly_fields = ('created_at', 'progress_percentage')
+    ordering = ('-week_start',)
+    
+    def progress_percentage(self, obj):
+        return f"{obj.progress_percentage():.1f}%"
+    progress_percentage.short_description = 'Progress %'
+    
+    fieldsets = (
+        ('Weekly Goal', {
+            'fields': ('user', 'week_start')
+        }),
+        ('Targets', {
+            'fields': ('target_study_hours', 'target_sessions')
+        }),
+        ('Actual Progress', {
+            'fields': ('actual_study_hours', 'actual_sessions', 'is_completed')
+        }),
+        ('Timestamps', {
+            'fields': ('created_at',)
+        }),
+    )
\ No newline at end of file
diff --git a/core/forms.py b/core/forms.py
index 777ce230..d742c56b 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -1,6 +1,8 @@
 from django import forms
-from .models import Contact, SuccessStory, Question, Answer
+from .models import Contact, SuccessStory, Question, Answer,Goal, Milestone, StudySession, WeeklyGoal
 from .models import FAQ
+from django.utils import timezone
+from datetime import datetime, timedelta
 
 class ContactForm(forms.ModelForm):
     class Meta:
@@ -125,4 +127,174 @@ def clean_content(self):
 class FAQForm(forms.ModelForm):
     class Meta:
         model = FAQ
-        fields = ['question', 'answer']
\ No newline at end of file
+        fields = ['question', 'answer']
+
+class GoalForm(forms.ModelForm):
+    class Meta:
+        model = Goal
+        fields = ['title', 'description', 'category', 'priority', 'target_date']
+        widgets = {
+            'title': forms.TextInput(attrs={
+                'class': 'form-input',
+                'placeholder': 'e.g., Master Python Programming',
+                'required': True
+            }),
+            'description': forms.Textarea(attrs={
+                'class': 'form-textarea',
+                'placeholder': 'Describe your goal in detail...',
+                'rows': 3
+            }),
+            'category': forms.Select(attrs={
+                'class': 'form-input',
+                'required': True
+            }),
+            'priority': forms.Select(attrs={
+                'class': 'form-input',
+                'required': True
+            }),
+            'target_date': forms.DateInput(attrs={
+                'class': 'form-input',
+                'type': 'date'
+            }),
+        }
+    
+    def clean_target_date(self):
+        target_date = self.cleaned_data.get('target_date')
+        if target_date and target_date <= timezone.now().date():
+            raise forms.ValidationError("Target date must be in the future.")
+        return target_date
+
+class MilestoneForm(forms.ModelForm):
+    class Meta:
+        model = Milestone
+        fields = ['title', 'description', 'due_date']
+        widgets = {
+            'title': forms.TextInput(attrs={
+                'class': 'form-input',
+                'placeholder': 'e.g., Complete Chapter 1',
+                'required': True
+            }),
+            'description': forms.Textarea(attrs={
+                'class': 'form-textarea',
+                'placeholder': 'Describe this milestone...',
+                'rows': 2
+            }),
+            'due_date': forms.DateInput(attrs={
+                'class': 'form-input',
+                'type': 'date'
+            }),
+        }
+
+class StudySessionForm(forms.ModelForm):
+    class Meta:
+        model = StudySession
+        fields = ['subject', 'title', 'description', 'duration_minutes', 'productivity_rating', 'notes', 'date']
+        widgets = {
+            'subject': forms.Select(attrs={
+                'class': 'form-input',
+                'required': True
+            }),
+            'title': forms.TextInput(attrs={
+                'class': 'form-input',
+                'placeholder': 'e.g., Algebra Practice Session',
+                'required': True
+            }),
+            'description': forms.Textarea(attrs={
+                'class': 'form-textarea',
+                'placeholder': 'What did you study?',
+                'rows': 2
+            }),
+            'duration_minutes': forms.NumberInput(attrs={
+                'class': 'form-input',
+                'placeholder': '60',
+                'min': '1',
+                'max': '480',
+                'required': True
+            }),
+            'productivity_rating': forms.NumberInput(attrs={
+                'class': 'form-input',
+                'min': '1',
+                'max': '10',
+                'value': '5',
+                'required': True
+            }),
+            'notes': forms.Textarea(attrs={
+                'class': 'form-textarea',
+                'placeholder': 'Any notes or reflections...',
+                'rows': 3
+            }),
+            'date': forms.DateInput(attrs={
+                'class': 'form-input',
+                'type': 'date',
+                'value': timezone.now().date()
+            }),
+        }
+    
+    def clean_duration_minutes(self):
+        duration = self.cleaned_data.get('duration_minutes')
+        if duration and (duration < 1 or duration > 480):
+            raise forms.ValidationError("Duration must be between 1 and 480 minutes (8 hours).")
+        return duration
+    
+    def clean_productivity_rating(self):
+        rating = self.cleaned_data.get('productivity_rating')
+        if rating and (rating < 1 or rating > 10):
+            raise forms.ValidationError("Productivity rating must be between 1 and 10.")
+        return rating
+    
+    def clean_date(self):
+        date = self.cleaned_data.get('date')
+        if date and date > timezone.now().date():
+            raise forms.ValidationError("Study session date cannot be in the future.")
+        return date
+
+class WeeklyGoalForm(forms.ModelForm):
+    class Meta:
+        model = WeeklyGoal
+        fields = ['target_study_hours', 'target_sessions']
+        widgets = {
+            'target_study_hours': forms.NumberInput(attrs={
+                'class': 'form-input',
+                'placeholder': '10.0',
+                'step': '0.5',
+                'min': '0.5',
+                'max': '60',
+                'required': True
+            }),
+            'target_sessions': forms.NumberInput(attrs={
+                'class': 'form-input',
+                'placeholder': '5',
+                'min': '1',
+                'max': '20',
+                'required': True
+            }),
+        }
+    
+    def clean_target_study_hours(self):
+        hours = self.cleaned_data.get('target_study_hours')
+        if hours and (hours < 0.5 or hours > 60):
+            raise forms.ValidationError("Target study hours must be between 0.5 and 60 hours per week.")
+        return hours
+    
+    def clean_target_sessions(self):
+        sessions = self.cleaned_data.get('target_sessions')
+        if sessions and (sessions < 1 or sessions > 20):
+            raise forms.ValidationError("Target sessions must be between 1 and 20 sessions per week.")
+        return sessions
+
+class GoalUpdateForm(forms.ModelForm):
+    class Meta:
+        model = Goal
+        fields = ['progress_percentage', 'status']
+        widgets = {
+            'progress_percentage': forms.NumberInput(attrs={
+                'class': 'form-input',
+                'min': '0',
+                'max': '100',
+                'required': True
+            }),
+            'status': forms.Select(attrs={
+                'class': 'form-input',
+                'required': True
+            }),
+        }
\ No newline at end of file
diff --git a/core/migrations/0003_goal_milestone_studysession_userstats_achievement_and_more.py b/core/migrations/0003_goal_milestone_studysession_userstats_achievement_and_more.py
new file mode 100644
index 00000000..41ff2da0
--- /dev/null
+++ b/core/migrations/0003_goal_milestone_studysession_userstats_achievement_and_more.py
@@ -0,0 +1,132 @@
+# Generated by Django 5.2.4 on 2025-09-05 08:39
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_faq'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Goal',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField(blank=True)),
+                ('category', models.CharField(choices=[('academic', 'Academic'), ('skill', 'Skill Development'), ('career', 'Career'), ('personal', 'Personal Growth'), ('health', 'Health & Fitness'), ('creative', 'Creative'), ('other', 'Other')], max_length=20)),
+                ('priority', models.CharField(choices=[('low', 'Low'), ('medium', 'Medium'), ('high', 'High'), ('urgent', 'Urgent')], default='medium', max_length=10)),
+                ('status', models.CharField(choices=[('not_started', 'Not Started'), ('in_progress', 'In Progress'), ('completed', 'Completed'), ('paused', 'Paused'), ('cancelled', 'Cancelled')], default='not_started', max_length=20)),
+                ('target_date', models.DateField(blank=True, null=True)),
+                ('progress_percentage', models.PositiveIntegerField(default=0, help_text='0-100')),
+                ('is_completed', models.BooleanField(default=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('completed_at', models.DateTimeField(blank=True, null=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='goals', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-priority', '-created_at'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Milestone',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField(blank=True)),
+                ('is_completed', models.BooleanField(default=False)),
+                ('due_date', models.DateField(blank=True, null=True)),
+                ('completed_at', models.DateTimeField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('goal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='milestones', to='core.goal')),
+            ],
+            options={
+                'ordering': ['due_date', 'created_at'],
+            },
+        ),
+        migrations.CreateModel(
+            name='StudySession',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('subject', models.CharField(choices=[('math', 'Mathematics'), ('science', 'Science'), ('physics', 'Physics'), ('chemistry', 'Chemistry'), ('biology', 'Biology'), ('computer_science', 'Computer Science'), ('programming', 'Programming'), ('english', 'English'), ('history', 'History'), ('geography', 'Geography'), ('economics', 'Economics'), ('psychology', 'Psychology'), ('philosophy', 'Philosophy'), ('engineering', 'Engineering'), ('other', 'Other')], max_length=50)),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField(blank=True)),
+                ('duration_minutes', models.PositiveIntegerField(help_text='Duration in minutes')),
+                ('productivity_rating', models.PositiveIntegerField(default=5, help_text='1-10 scale')),
+                ('notes', models.TextField(blank=True)),
+                ('date', models.DateField(default=django.utils.timezone.now)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('goals_related', models.ManyToManyField(blank=True, related_name='study_sessions', to='core.goal')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='study_sessions', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-date', '-created_at'],
+            },
+        ),
+        migrations.CreateModel(
+            name='UserStats',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('total_study_hours', models.FloatField(default=0.0)),
+                ('total_goals_completed', models.PositiveIntegerField(default=0)),
+                ('current_streak_days', models.PositiveIntegerField(default=0)),
+                ('longest_streak_days', models.PositiveIntegerField(default=0)),
+                ('total_questions_asked', models.PositiveIntegerField(default=0)),
+                ('total_answers_given', models.PositiveIntegerField(default=0)),
+                ('total_success_stories', models.PositiveIntegerField(default=0)),
+                ('achievement_points', models.PositiveIntegerField(default=0)),
+                ('last_activity_date', models.DateField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='stats', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'User Statistics',
+                'verbose_name_plural': 'User Statistics',
+            },
+        ),
+        migrations.CreateModel(
+            name='Achievement',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField()),
+                ('achievement_type', models.CharField(choices=[('goal_completed', 'Goal Completed'), ('streak', 'Study Streak'), ('milestone', 'Milestone Reached'), ('participation', 'Community Participation'), ('helping_others', 'Helping Others'), ('consistency', 'Consistency'), ('improvement', 'Improvement'), ('special', 'Special Achievement')], max_length=20)),
+                ('icon', models.CharField(default='🏆', max_length=10)),
+                ('points', models.PositiveIntegerField(default=10)),
+                ('is_earned', models.BooleanField(default=True)),
+                ('earned_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='achievements', to=settings.AUTH_USER_MODEL)),
+                ('related_goal', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.goal')),
+            ],
+            options={
+                'ordering': ['-earned_at'],
+                'unique_together': {('user', 'title', 'achievement_type')},
+            },
+        ),
+        migrations.CreateModel(
+            name='WeeklyGoal',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('week_start', models.DateField()),
+                ('target_study_hours', models.FloatField(default=10.0)),
+                ('target_sessions', models.PositiveIntegerField(default=5)),
+                ('actual_study_hours', models.FloatField(default=0.0)),
+                ('actual_sessions', models.PositiveIntegerField(default=0)),
+                ('is_completed', models.BooleanField(default=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='weekly_goals', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-week_start'],
+                'unique_together': {('user', 'week_start')},
+            },
+        ),
+    ]
diff --git a/core/models.py b/core/models.py
index 9478c5ac..61ca22d2 100644
--- a/core/models.py
+++ b/core/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils import timezone
+from datetime import timedelta
 
 class Contact(models.Model):
     first_name = models.CharField(max_length=50)
@@ -210,4 +211,224 @@ class FAQ(models.Model):
     answer = models.TextField()
 
     def __str__(self):
-        return self.question
\ No newline at end of file
+        return self.question
+    
+class Goal(models.Model):
+    CATEGORY_CHOICES = [
+        ('academic', 'Academic'),
+        ('skill', 'Skill Development'),
+        ('career', 'Career'),
+        ('personal', 'Personal Growth'),
+        ('health', 'Health & Fitness'),
+        ('creative', 'Creative'),
+        ('other', 'Other'),
+    ]
+    
+    PRIORITY_CHOICES = [
+        ('low', 'Low'),
+        ('medium', 'Medium'),
+        ('high', 'High'),
+        ('urgent', 'Urgent'),
+    ]
+    
+    STATUS_CHOICES = [
+        ('not_started', 'Not Started'),
+        ('in_progress', 'In Progress'),
+        ('completed', 'Completed'),
+        ('paused', 'Paused'),
+        ('cancelled', 'Cancelled'),
+    ]
+    
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='goals')
+    title = models.CharField(max_length=200)
+    description = models.TextField(blank=True)
+    category = models.CharField(max_length=20, choices=CATEGORY_CHOICES)
+    priority = models.CharField(max_length=10, choices=PRIORITY_CHOICES, default='medium')
+    status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='not_started')
+    target_date = models.DateField(null=True, blank=True)
+    progress_percentage = models.PositiveIntegerField(default=0, help_text="0-100")
+    is_completed = models.BooleanField(default=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    completed_at = models.DateTimeField(null=True, blank=True)
+    
+    class Meta:
+        ordering = ['-priority', '-created_at']
+        
+    def __str__(self):
+        return self.title
+    
+    def is_overdue(self):
+        if self.target_date and not self.is_completed:
+            return timezone.now().date() > self.target_date
+        return False
+    
+    def days_remaining(self):
+        if self.target_date and not self.is_completed:
+            delta = self.target_date - timezone.now().date()
+            return delta.days
+        return None
+    
+    def save(self, *args, **kwargs):
+        if self.progress_percentage >= 100 and not self.is_completed:
+            self.is_completed = True
+            self.status = 'completed'
+            self.completed_at = timezone.now()
+        elif self.progress_percentage < 100 and self.is_completed:
+            self.is_completed = False
+            self.status = 'in_progress'
+            self.completed_at = None
+        super().save(*args, **kwargs)
+
+class Milestone(models.Model):
+    goal = models.ForeignKey(Goal, on_delete=models.CASCADE, related_name='milestones')
+    title = models.CharField(max_length=200)
+    description = models.TextField(blank=True)
+    is_completed = models.BooleanField(default=False)
+    due_date = models.DateField(null=True, blank=True)
+    completed_at = models.DateTimeField(null=True, blank=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    
+    class Meta:
+        ordering = ['due_date', 'created_at']
+        
+    def __str__(self):
+        return f"{self.goal.title} - {self.title}"
+
+class StudySession(models.Model):
+    SUBJECT_CHOICES = [
+        ('math', 'Mathematics'),
+        ('science', 'Science'),
+        ('physics', 'Physics'),
+        ('chemistry', 'Chemistry'),
+        ('biology', 'Biology'),
+        ('computer_science', 'Computer Science'),
+        ('programming', 'Programming'),
+        ('english', 'English'),
+        ('history', 'History'),
+        ('geography', 'Geography'),
+        ('economics', 'Economics'),
+        ('psychology', 'Psychology'),
+        ('philosophy', 'Philosophy'),
+        ('engineering', 'Engineering'),
+        ('other', 'Other'),
+    ]
+    
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='study_sessions')
+    subject = models.CharField(max_length=50, choices=SUBJECT_CHOICES)
+    title = models.CharField(max_length=200)
+    description = models.TextField(blank=True)
+    duration_minutes = models.PositiveIntegerField(help_text="Duration in minutes")
+    productivity_rating = models.PositiveIntegerField(
+        default=5, 
+        help_text="1-10 scale"
+    )
+    goals_related = models.ManyToManyField(Goal, blank=True, related_name='study_sessions')
+    notes = models.TextField(blank=True)
+    date = models.DateField(default=timezone.now)
+    created_at = models.DateTimeField(auto_now_add=True)
+    
+    class Meta:
+        ordering = ['-date', '-created_at']
+        
+    def __str__(self):
+        return f"{self.subject} - {self.title} ({self.duration_minutes}min)"
+
+class Achievement(models.Model):
+    ACHIEVEMENT_TYPES = [
+        ('goal_completed', 'Goal Completed'),
+        ('streak', 'Study Streak'),
+        ('milestone', 'Milestone Reached'),
+        ('participation', 'Community Participation'),
+        ('helping_others', 'Helping Others'),
+        ('consistency', 'Consistency'),
+        ('improvement', 'Improvement'),
+        ('special', 'Special Achievement'),
+    ]
+    
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='achievements')
+    title = models.CharField(max_length=200)
+    description = models.TextField()
+    achievement_type = models.CharField(max_length=20, choices=ACHIEVEMENT_TYPES)
+    icon = models.CharField(max_length=10, default='🏆')
+    points = models.PositiveIntegerField(default=10)
+    is_earned = models.BooleanField(default=True)
+    earned_at = models.DateTimeField(auto_now_add=True)
+    related_goal = models.ForeignKey(Goal, on_delete=models.SET_NULL, null=True, blank=True)
+    
+    class Meta:
+        ordering = ['-earned_at']
+        unique_together = ('user', 'title', 'achievement_type')
+        
+    def __str__(self):
+        return f"{self.user.username} - {self.title}"
+
+class UserStats(models.Model):
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='stats')
+    total_study_hours = models.FloatField(default=0.0)
+    total_goals_completed = models.PositiveIntegerField(default=0)
+    current_streak_days = models.PositiveIntegerField(default=0)
+    longest_streak_days = models.PositiveIntegerField(default=0)
+    total_questions_asked = models.PositiveIntegerField(default=0)
+    total_answers_given = models.PositiveIntegerField(default=0)
+    total_success_stories = models.PositiveIntegerField(default=0)
+    achievement_points = models.PositiveIntegerField(default=0)
+    last_activity_date = models.DateField(null=True, blank=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    
+    class Meta:
+        verbose_name = 'User Statistics'
+        verbose_name_plural = 'User Statistics'
+        
+    def __str__(self):
+        return f"{self.user.username} - Stats"
+    
+    def update_streak(self):
+        """Update study streak based on recent activity"""
+        today = timezone.now().date()
+        yesterday = today - timedelta(days=1)
+        
+        # Check if user has activity today or yesterday
+        recent_sessions = StudySession.objects.filter(
+            user=self.user,
+            date__in=[today, yesterday]
+        ).exists()
+        
+        if recent_sessions:
+            if self.last_activity_date == yesterday:
+                self.current_streak_days += 1
+            elif self.last_activity_date != today:
+                self.current_streak_days = 1
+                
+            self.last_activity_date = today
+            
+            if self.current_streak_days > self.longest_streak_days:
+                self.longest_streak_days = self.current_streak_days
+        else:
+            # Reset streak if no recent activity
+            self.current_streak_days = 0
+            
+        self.save()
+
+class WeeklyGoal(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='weekly_goals')
+    week_start = models.DateField()
+    target_study_hours = models.FloatField(default=10.0)
+    target_sessions = models.PositiveIntegerField(default=5)
+    actual_study_hours = models.FloatField(default=0.0)
+    actual_sessions = models.PositiveIntegerField(default=0)
+    is_completed = models.BooleanField(default=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    
+    class Meta:
+        unique_together = ('user', 'week_start')
+        ordering = ['-week_start']
+        
+    def __str__(self):
+        return f"{self.user.username} - Week of {self.week_start}"
+    
+    def progress_percentage(self):
+        hours_progress = min((self.actual_study_hours / self.target_study_hours) * 100, 100) if self.target_study_hours > 0 else 100
+        sessions_progress = min((self.actual_sessions / self.target_sessions) * 100, 100) if self.target_sessions > 0 else 100
+        return (hours_progress + sessions_progress) / 2
\ No newline at end of file
diff --git a/core/static/css/progress.css b/core/static/css/progress.css
new file mode 100644
index 00000000..8bdc823d
--- /dev/null
+++ b/core/static/css/progress.css
@@ -0,0 +1,1036 @@
+/* Progress Tracking Styles - Add to core/static/css/progress.css */
+
+.progress-container {
+    max-width: 1400px;
+    margin: 0 auto;
+    padding: 0 2rem;
+}
+
+.progress-header {
+    text-align: center;
+    margin-bottom: 3rem;
+}
+
+.progress-header .main-title {
+    font-size: 3.5rem;
+    font-weight: 800;
+    background: linear-gradient(135deg, #ffffff 0%, #3b82f6 100%);
+    -webkit-background-clip: text;
+    background-clip: text;
+    -webkit-text-fill-color: transparent;
+    margin-bottom: 1rem;
+}
+
+.progress-header .subtitle {
+    font-size: 1.2rem;
+    color: rgba(255, 255, 255, 0.8);
+    margin-bottom: 2rem;
+}
+
+/* Quick Actions */
+.quick-actions {
+    display: flex;
+    gap: 1rem;
+    justify-content: center;
+    flex-wrap: wrap;
+}
+
+.action-btn {
+    background: linear-gradient(135deg, #3b82f6, #1d4ed8);
+    color: white;
+    border: none;
+    border-radius: 12px;
+    padding: 0.75rem 1.5rem;
+    font-weight: 600;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    transition: all 0.3s ease;
+}
+
+.action-btn:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 10px 25px rgba(59, 130, 246, 0.3);
+}
+
+/* Statistics Grid */
+.stats-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+    gap: 1.5rem;
+    margin-bottom: 3rem;
+}
+
+.stat-card {
+    background: rgba(30, 41, 59, 0.4);
+    backdrop-filter: blur(15px);
+    border: 1px solid rgba(59, 130, 246, 0.2);
+    border-radius: 16px;
+    padding: 2rem;
+    display: flex;
+    align-items: center;
+    gap: 1.5rem;
+    transition: all 0.3s ease;
+}
+
+.stat-card:hover {
+    transform: translateY(-3px);
+    border-color: rgba(59, 130, 246, 0.4);
+    box-shadow: 0 15px 30px rgba(0, 0, 0, 0.2);
+}
+
+.stat-icon {
+    width: 60px;
+    height: 60px;
+    background: linear-gradient(135deg, #3b82f6, #1d4ed8);
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 1.5rem;
+    color: white;
+}
+
+.stat-content h3 {
+    font-size: 2rem;
+    font-weight: 800;
+    color: white;
+    margin-bottom: 0.5rem;
+}
+
+.stat-content p {
+    color: rgba(255, 255, 255, 0.7);
+    font-size: 0.9rem;
+    margin: 0;
+}
+
+/* Content Grid */
+.content-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 2rem;
+}
+
+.left-column, .right-column {
+    display: flex;
+    flex-direction: column;
+    gap: 2rem;
+}
+
+/* Progress Cards */
+.progress-card {
+    background: rgba(30, 41, 59, 0.4);
+    backdrop-filter: blur(15px);
+    border: 1px solid rgba(59, 130, 246, 0.2);
+    border-radius: 16px;
+    padding: 2rem;
+    transition: all 0.3s ease;
+}
+
+.progress-card:hover {
+    border-color: rgba(59, 130, 246, 0.4);
+}
+
+.card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 1.5rem;
+}
+
+.card-header h3 {
+    font-size: 1.3rem;
+    font-weight: 600;
+    color: white;
+    margin: 0;
+}
+
+.time-period {
+    color: rgba(255, 255, 255, 0.6);
+    font-size: 0.85rem;
+}
+
+.header-btn {
+    background: rgba(59, 130, 246, 0.2);
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    border-radius: 8px;
+    color: #3b82f6;
+    padding: 0.5rem;
+    cursor: pointer;
+    transition: all 0.3s ease;
+}
+
+.header-btn:hover {
+    background: rgba(59, 130, 246, 0.3);
+    transform: scale(1.1);
+}
+
+/* Weekly Progress */
+.weekly-stats {
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+.weekly-stat {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+
+.stat-label {
+    color: rgba(255, 255, 255, 0.8);
+    font-weight: 500;
+    font-size: 0.9rem;
+}
+
+.progress-bar {
+    background: rgba(15, 23, 42, 0.6);
+    border-radius: 8px;
+    height: 8px;
+    overflow: hidden;
+    position: relative;
+}
+
+.progress-fill {
+    background: linear-gradient(135deg, #10b981, #059669);
+    height: 100%;
+    border-radius: 8px;
+    transition: width 0.8s ease;
+    position: relative;
+}
+
+.progress-fill::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
+    animation: shimmer 2s infinite;
+}
+
+@keyframes shimmer {
+    0% { transform: translateX(-100%); }
+    100% { transform: translateX(100%); }
+}
+
+.stat-value {
+    color: white;
+    font-weight: 600;
+    font-size: 0.9rem;
+}
+
+/* Chart Container */
+.chart-container {
+    position: relative;
+    height: 250px;
+    margin-top: 1rem;
+}
+
+/* Goals Container */
+.goals-container {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    max-height: 400px;
+    overflow-y: auto;
+}
+
+.goal-item {
+    background: rgba(15, 23, 42, 0.6);
+    border: 1px solid rgba(59, 130, 246, 0.2);
+    border-radius: 12px;
+    padding: 1.5rem;
+    transition: all 0.3s ease;
+    cursor: pointer;
+}
+
+.goal-item:hover {
+    border-color: rgba(59, 130, 246, 0.4);
+    transform: translateX(5px);
+}
+
+.goal-header {
+    display: flex;
+    justify-content: between;
+    align-items: flex-start;
+    gap: 1rem;
+    margin-bottom: 1rem;
+}
+
+.goal-info {
+    flex: 1;
+}
+
+.goal-title {
+    font-size: 1.1rem;
+    font-weight: 600;
+    color: white;
+    margin-bottom: 0.5rem;
+}
+
+.goal-meta {
+    display: flex;
+    gap: 1rem;
+    flex-wrap: wrap;
+    margin-bottom: 1rem;
+}
+
+.goal-badge {
+    padding: 0.2rem 0.6rem;
+    border-radius: 12px;
+    font-size: 0.7rem;
+    font-weight: 500;
+}
+
+.priority-low { background: rgba(107, 114, 128, 0.3); color: #9ca3af; }
+.priority-medium { background: rgba(251, 191, 36, 0.3); color: #fbbf24; }
+.priority-high { background: rgba(239, 68, 68, 0.3); color: #ef4444; }
+.priority-urgent { background: rgba(220, 38, 127, 0.3); color: #dc2626; }
+
+.status-not_started { background: rgba(107, 114, 128, 0.3); color: #9ca3af; }
+.status-in_progress { background: rgba(59, 130, 246, 0.3); color: #3b82f6; }
+.status-completed { background: rgba(16, 185, 129, 0.3); color: #10b981; }
+.status-paused { background: rgba(251, 191, 36, 0.3); color: #fbbf24; }
+
+.goal-progress {
+    margin-bottom: 1rem;
+}
+
+.goal-progress-bar {
+    background: rgba(15, 23, 42, 0.8);
+    border-radius: 6px;
+    height: 6px;
+    overflow: hidden;
+    margin-top: 0.5rem;
+}
+
+.goal-progress-fill {
+    background: linear-gradient(135deg, #3b82f6, #1d4ed8);
+    height: 100%;
+    border-radius: 6px;
+    transition: width 0.8s ease;
+}
+
+.goal-actions {
+    display: flex;
+    gap: 0.5rem;
+}
+
+.goal-btn {
+    background: transparent;
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    color: #3b82f6;
+    border-radius: 6px;
+    padding: 0.4rem 0.8rem;
+    font-size: 0.8rem;
+    cursor: pointer;
+    transition: all 0.3s ease;
+}
+
+.goal-btn:hover {
+    background: rgba(59, 130, 246, 0.2);
+}
+
+/* Activity Feed */
+.activity-feed {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    max-height: 400px;
+    overflow-y: auto;
+}
+
+.activity-item {
+    background: rgba(15, 23, 42, 0.6);
+    border-left: 3px solid #3b82f6;
+    border-radius: 8px;
+    padding: 1rem;
+    transition: all 0.3s ease;
+}
+
+.activity-item:hover {
+    background: rgba(15, 23, 42, 0.8);
+    transform: translateX(3px);
+}
+
+.activity-header {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    margin-bottom: 0.5rem;
+}
+
+.activity-icon {
+    font-size: 1.2rem;
+}
+
+.activity-title {
+    font-weight: 600;
+    color: white;
+    font-size: 0.95rem;
+}
+
+.activity-description {
+    color: rgba(255, 255, 255, 0.7);
+    font-size: 0.85rem;
+    margin-bottom: 0.5rem;
+}
+
+.activity-time {
+    color: rgba(255, 255, 255, 0.5);
+    font-size: 0.75rem;
+}
+
+/* Achievements */
+.achievements-container {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+.achievement-item {
+    background: linear-gradient(135deg, rgba(59, 130, 246, 0.1), rgba(16, 185, 129, 0.1));
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    border-radius: 12px;
+    padding: 1rem;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    transition: all 0.3s ease;
+}
+
+.achievement-item:hover {
+    transform: scale(1.02);
+    border-color: rgba(59, 130, 246, 0.5);
+}
+
+.achievement-icon {
+    font-size: 2rem;
+    width: 50px;
+    text-align: center;
+}
+
+.achievement-content {
+    flex: 1;
+}
+
+.achievement-title {
+    font-weight: 600;
+    color: white;
+    font-size: 0.95rem;
+    margin-bottom: 0.3rem;
+}
+
+.achievement-description {
+    color: rgba(255, 255, 255, 0.7);
+    font-size: 0.8rem;
+}
+
+.achievement-points {
+    background: linear-gradient(135deg, #10b981, #059669);
+    color: white;
+    padding: 0.3rem 0.6rem;
+    border-radius: 12px;
+    font-size: 0.75rem;
+    font-weight: 600;
+}
+
+/* Modals */
+.modal {
+    display: none;
+    position: fixed;
+    z-index: 2000;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.7);
+    backdrop-filter: blur(5px);
+    overflow-y: auto;
+}
+
+.modal-content {
+    background: rgba(30, 41, 59, 0.95);
+    backdrop-filter: blur(20px);
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    border-radius: 20px;
+    margin: 2% auto; /* Reduced top margin */
+    padding: 0;
+    width: 90%;
+    max-width: 600px;
+    max-height: 90vh; /* Limit max height */
+    animation: modalSlideIn 0.3s ease;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+}
+
+.modal-content.large {
+    max-width: 800px;
+}
+
+@keyframes modalSlideIn {
+    from {
+        opacity: 0;
+        transform: translateY(-50px) scale(0.9);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0) scale(1);
+    }
+}
+
+.modal-header {
+    background: linear-gradient(135deg, #3b82f6, #1d4ed8);
+    padding: 1.5rem 2rem;
+    border-radius: 20px 20px 0 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-shrink: 0; /* Don't shrink header */
+}
+
+.modal-header h2 {
+    color: white;
+    font-size: 1.5rem;
+    font-weight: 700;
+    margin: 0;
+}
+
+.close {
+    color: white;
+    font-size: 2rem;
+    font-weight: bold;
+    cursor: pointer;
+    line-height: 1;
+    transition: all 0.3s ease;
+    padding: 0;
+    margin: 0;
+    background: none;
+    border: none;
+}
+
+.close:hover {
+    transform: scale(1.2);
+}
+.modal-form-container {
+    padding: 2rem;
+    flex: 1;
+    overflow-y: auto; /* Allow form content to scroll */
+    max-height: calc(90vh - 100px); /* Account for header height */
+}
+
+.modal-content form {
+    padding: 0;
+}
+.form-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 1.5rem;
+    margin-bottom: 1.5rem;
+}
+
+.form-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.form-group.full-width {
+    grid-column: 1 / -1;
+}
+
+.form-label {
+    font-size: 0.9rem;
+    font-weight: 600;
+    color: rgba(255, 255, 255, 0.9);
+    margin-bottom: 0.5rem;
+}
+
+.required {
+    color: #3b82f6;
+}
+
+.form-input, .form-textarea {
+    background: rgba(15, 23, 42, 0.8);
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    border-radius: 12px;
+    padding: 1rem 1.2rem;
+    color: white;
+    font-size: 1rem;
+    transition: all 0.3s ease;
+    outline: none;
+    resize: vertical;
+}
+
+.form-input:focus, .form-textarea:focus {
+    border-color: #3b82f6;
+    box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+    transform: translateY(-1px);
+}
+
+.form-input::placeholder, .form-textarea::placeholder {
+    color: rgba(255, 255, 255, 0.4);
+}
+
+.form-textarea {
+    min-height: 80px;
+    resize: vertical;
+}
+.modal-actions {
+    display: flex;
+    gap: 1rem;
+    justify-content: flex-end;
+    margin-top: 2rem;
+    padding-top: 1.5rem;
+    border-top: 1px solid rgba(255, 255, 255, 0.1);
+    flex-shrink: 0; /* Don't shrink buttons */
+    background: rgba(30, 41, 59, 0.95); /* Ensure buttons are visible */
+}
+
+.btn-secondary {
+    background: transparent;
+    border: 1px solid rgba(255, 255, 255, 0.3);
+    color: rgba(255, 255, 255, 0.8);
+    border-radius: 8px;
+    padding: 0.75rem 1.5rem;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    font-weight: 500;
+}
+
+.btn-secondary:hover {
+    background: rgba(255, 255, 255, 0.1);
+    color: white;
+}
+.submit-btn {
+    background: linear-gradient(135deg, #3b82f6, #1d4ed8);
+    color: white;
+    border: none;
+    border-radius: 8px;
+    padding: 0.75rem 1.5rem;
+    font-size: 1rem;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    min-width: 120px;
+}
+
+.submit-btn:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 5px 15px rgba(59, 130, 246, 0.3);
+}
+
+.submit-btn:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+    transform: none;
+}
+.view-all {
+    text-align: center;
+    margin-top: 1rem;
+}
+
+.view-all button {
+    background: transparent;
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    color: #3b82f6;
+    border-radius: 8px;
+    padding: 0.5rem 1rem;
+    cursor: pointer;
+    transition: all 0.3s ease;
+}
+
+.view-all button:hover {
+    background: rgba(59, 130, 246, 0.2);
+}
+
+/* Goal Detail Styles */
+.goal-detail-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    margin-bottom: 2rem;
+    gap: 2rem;
+}
+
+.goal-detail-info {
+    flex: 1;
+}
+
+.goal-detail-title {
+    font-size: 1.5rem;
+    font-weight: 700;
+    color: white;
+    margin-bottom: 1rem;
+}
+
+.goal-detail-meta {
+    display: flex;
+    gap: 1rem;
+    flex-wrap: wrap;
+    margin-bottom: 1rem;
+}
+
+.goal-detail-description {
+    color: rgba(255, 255, 255, 0.8);
+    line-height: 1.6;
+    margin-bottom: 1.5rem;
+}
+
+.goal-detail-actions {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    min-width: 200px;
+}
+
+.progress-update {
+    background: rgba(15, 23, 42, 0.6);
+    border: 1px solid rgba(59, 130, 246, 0.3);
+    border-radius: 12px;
+    padding: 1.5rem;
+}
+
+.progress-update h4 {
+    color: white;
+    font-size: 1rem;
+    margin-bottom: 1rem;
+}
+
+.progress-input {
+    width: 100%;
+    margin-bottom: 1rem;
+}
+
+.milestones-section {
+    margin-top: 2rem;
+}
+
+.milestones-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 1rem;
+}
+
+.milestones-list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+}
+
+.milestone-item {
+    background: rgba(15, 23, 42, 0.4);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    border-radius: 8px;
+    padding: 1rem;
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    transition: all 0.3s ease;
+}
+
+.milestone-item:hover {
+    background: rgba(15, 23, 42, 0.6);
+}
+
+.milestone-checkbox {
+    width: 20px;
+    height: 20px;
+    border: 2px solid #3b82f6;
+    border-radius: 4px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s ease;
+}
+
+.milestone-checkbox.completed {
+    background: #3b82f6;
+    color: white;
+}
+
+.milestone-content {
+    flex: 1;
+}
+
+.milestone-title {
+    color: white;
+    font-weight: 500;
+    margin-bottom: 0.3rem;
+}
+
+.milestone-due {
+    color: rgba(255, 255, 255, 0.6);
+    font-size: 0.8rem;
+}
+
+/* Light Mode Styles */
+body.light-mode .progress-header .main-title {
+    background: linear-gradient(135deg, #1F5F4A 0%, #328E6E 100%);
+    -webkit-background-clip: text;
+    background-clip: text;
+    -webkit-text-fill-color: transparent;
+}
+
+body.light-mode .progress-header .subtitle {
+    color: #19624D;
+}
+
+body.light-mode .action-btn {
+    background: linear-gradient(135deg, #328E6E, #1F5F4A);
+}
+
+body.light-mode .stat-card {
+    background: #90C67C;
+    border: 1px solid rgba(31, 95, 74, 0.3);
+}
+
+body.light-mode .stat-icon {
+    background: linear-gradient(135deg, #1F5F4A, #328E6E);
+}
+
+body.light-mode .stat-content h3 {
+    color: #2F4F2F;
+}
+
+body.light-mode .stat-content p {
+    color: #19624D;
+}
+
+body.light-mode .progress-card {
+    background: #90C67C;
+    border: 1px solid rgba(31, 95, 74, 0.3);
+}
+
+body.light-mode .card-header h3 {
+    color: #2F4F2F;
+}
+
+body.light-mode .time-period {
+    color: #19624D;
+}
+
+body.light-mode .header-btn {
+    background: rgba(31, 95, 74, 0.2);
+    border: 1px solid rgba(31, 95, 74, 0.4);
+    color: #1F5F4A;
+}
+
+body.light-mode .stat-label {
+    color: #12241f;
+}
+
+body.light-mode .progress-bar {
+    background: rgba(31, 95, 74, 0.2);
+}
+
+body.light-mode .stat-value {
+    color: #2F4F2F;
+}
+
+body.light-mode .goal-item {
+    background: rgba(31, 95, 74, 0.1);
+    border: 1px solid rgba(31, 95, 74, 0.3);
+}
+
+body.light-mode .goal-title {
+    color: #2F4F2F;
+}
+
+body.light-mode .modal-content {
+    background: #90C67C;
+    border: 1px solid rgba(31, 95, 74, 0.4);
+}
+
+body.light-mode .modal-header {
+    background: linear-gradient(135deg, #328E6E, #1F5F4A);
+}
+body.light-mode .form-input, 
+body.light-mode .form-textarea {
+    background: #E1EEBC;
+    border: 1px solid #328E6E;
+    color: #2F4F2F;
+}
+
+body.light-mode .form-input:focus, 
+body.light-mode .form-textarea:focus {
+    border-color: #328E6E;
+    box-shadow: 0 0 0 3px rgba(50, 142, 110, 0.2);
+}
+
+body.light-mode .form-input::placeholder, 
+body.light-mode .form-textarea::placeholder {
+    color: rgba(47, 79, 47, 0.6);
+}
+
+body.light-mode .form-label {
+    color: #2F4F2F;
+}
+
+body.light-mode .btn-secondary {
+    border: 1px solid rgba(31, 95, 74, 0.4);
+    color: #1F5F4A;
+}
+
+body.light-mode .btn-secondary:hover {
+    background: rgba(31, 95, 74, 0.2);
+}
+
+body.light-mode .submit-btn {
+    background: linear-gradient(135deg, #328E6E, #1F5F4A);
+}
+
+body.light-mode .modal-actions {
+    background: #90C67C;
+    border-top: 1px solid rgba(31, 95, 74, 0.2);
+}
+body.light-mode .btn-secondary {
+    border: 1px solid rgba(31, 95, 74, 0.4);
+    color: #1F5F4A;
+}
+
+body.light-mode .activity-item {
+    background: rgba(31, 95, 74, 0.1);
+    border-left-color: #328E6E;
+}
+
+body.light-mode .activity-title {
+    color: #2F4F2F;
+}
+
+body.light-mode .activity-description {
+    color: #19624D;
+}
+
+body.light-mode .activity-time {
+    color: #67AE6E;
+}
+
+body.light-mode .achievement-item {
+    background: linear-gradient(135deg, rgba(31, 95, 74, 0.1), rgba(50, 142, 110, 0.1));
+    border: 1px solid rgba(31, 95, 74, 0.4);
+}
+
+body.light-mode .achievement-title {
+    color: #2F4F2F;
+}
+
+body.light-mode .achievement-description {
+    color: #19624D;
+}
+
+body.light-mode .milestone-item {
+    background: rgba(31, 95, 74, 0.1);
+    border: 1px solid rgba(31, 95, 74, 0.2);
+}
+
+body.light-mode .milestone-title {
+    color: #2F4F2F;
+}
+
+body.light-mode .milestone-due {
+    color: #19624D;
+}
+
+body.light-mode .milestone-checkbox {
+    border-color: #328E6E;
+}
+
+body.light-mode .milestone-checkbox.completed {
+    background: #328E6E;
+}
+
+body.light-mode .view-all button {
+    border: 1px solid rgba(31, 95, 74, 0.4);
+    color: #1F5F4A;
+}
+
+/* Responsive Design */
+@media (max-width: 1024px) {
+    .content-grid {
+        grid-template-columns: 1fr;
+    }
+    
+    .stats-grid {
+        grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+    }
+}
+
+@media (max-width: 768px) {
+    .progress-container {
+        padding: 0 1rem;
+    }
+    
+    .progress-header .main-title {
+        font-size: 2.5rem;
+    }
+    
+    .quick-actions {
+        flex-direction: column;
+        align-items: center;
+    }
+    
+    .action-btn {
+        width: 200px;
+        justify-content: center;
+    }
+    
+    .stats-grid {
+        grid-template-columns: 1fr;
+    }
+    
+    .modal-content {
+        width: 95%;
+        margin: 2% auto;
+    }
+    
+    .goal-header {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+    
+    .goal-detail-header {
+        flex-direction: column;
+    }
+    
+    .goal-detail-actions {
+        width: 100%;
+    }
+}
+@media (max-width: 768px) {
+    .modal-content {
+        width: 95%;
+        margin: 1% auto;
+        max-height: 95vh;
+    }
+    
+    .form-grid {
+        grid-template-columns: 1fr;
+    }
+    
+    .modal-header {
+        padding: 1rem 1.5rem;
+    }
+    
+    .modal-form-container {
+        padding: 1.5rem;
+    }
+    
+    .modal-actions {
+        flex-direction: column;
+        gap: 0.75rem;
+    }
+    
+    .btn-secondary, .submit-btn {
+        width: 100%;
+        justify-content: center;
+    }
+}
\ No newline at end of file
diff --git a/core/static/js/progress.js b/core/static/js/progress.js
new file mode 100644
index 00000000..c0934c15
--- /dev/null
+++ b/core/static/js/progress.js
@@ -0,0 +1,858 @@
+// Progress Tracking JavaScript - Create as core/static/js/progress.js
+
+let charts = {};
+let currentGoals = [];
+
+document.addEventListener('DOMContentLoaded', function() {
+    loadProgressData();
+    setupEventListeners();
+});
+
+function setupEventListeners() {
+    // Goal Form
+    document.getElementById('goalForm').addEventListener('submit', handleGoalSubmission);
+    
+    // Session Form
+    document.getElementById('sessionForm').addEventListener('submit', handleSessionSubmission);
+    
+    // Weekly Goals Form
+    document.getElementById('weeklyForm').addEventListener('submit', handleWeeklyGoalSubmission);
+    
+    // Modal close on outside click
+    window.addEventListener('click', function(e) {
+        if (e.target.classList.contains('modal')) {
+            closeModal(e.target.id);
+        }
+    });
+}
+
+async function loadProgressData() {
+    try {
+        showLoading();
+        
+        // Load dashboard data
+        const response = await fetch('/api/progress-dashboard/', {
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            updateStatistics(data.stats);
+            updateWeeklyProgress(data.weekly_progress);
+            renderDailyChart(data.daily_data);
+            renderSubjectChart(data.subject_data);
+            displayRecentActivity(data.recent_sessions);
+            displayAchievements(data.recent_achievements);
+        }
+        
+        // Load goals
+        await loadGoals();
+        
+        hideLoading();
+        
+    } catch (error) {
+        console.error('Error loading progress data:', error);
+        showNotification('Failed to load progress data', 'error');
+        hideLoading();
+    }
+}
+
+async function loadGoals() {
+    try {
+        const response = await fetch('/api/goals/', {
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            currentGoals = data.goals;
+            displayGoals(data.goals);
+        }
+        
+    } catch (error) {
+        console.error('Error loading goals:', error);
+    }
+}
+
+function updateStatistics(stats) {
+    document.getElementById('totalHours').textContent = stats.total_study_hours;
+    document.getElementById('completedGoals').textContent = stats.total_goals_completed;
+    document.getElementById('currentStreak').textContent = stats.current_streak_days;
+    document.getElementById('achievementPoints').textContent = stats.achievement_points;
+}
+
+function updateWeeklyProgress(weekly) {
+    const hoursProgress = Math.min((weekly.actual_hours / weekly.target_hours) * 100, 100);
+    const sessionsProgress = Math.min((weekly.actual_sessions / weekly.target_sessions) * 100, 100);
+    
+    document.getElementById('weeklyHoursProgress').style.width = hoursProgress + '%';
+    document.getElementById('weeklySessionsProgress').style.width = sessionsProgress + '%';
+    document.getElementById('weeklyHoursText').textContent = `${weekly.actual_hours} / ${weekly.target_hours} hrs`;
+    document.getElementById('weeklySessionsText').textContent = `${weekly.actual_sessions} / ${weekly.target_sessions} sessions`;
+}
+
+function renderDailyChart(dailyData) {
+    const ctx = document.getElementById('dailyChart').getContext('2d');
+    
+    if (charts.daily) {
+        charts.daily.destroy();
+    }
+    
+    charts.daily = new Chart(ctx, {
+        type: 'line',
+        data: {
+            labels: dailyData.map(d => d.day),
+            datasets: [{
+                label: 'Study Hours',
+                data: dailyData.map(d => d.hours),
+                borderColor: '#3b82f6',
+                backgroundColor: 'rgba(59, 130, 246, 0.1)',
+                borderWidth: 3,
+                fill: true,
+                tension: 0.4,
+                pointBackgroundColor: '#3b82f6',
+                pointBorderColor: '#ffffff',
+                pointBorderWidth: 2,
+                pointRadius: 6,
+                pointHoverRadius: 8,
+            }]
+        },
+        options: {
+            responsive: true,
+            maintainAspectRatio: false,
+            plugins: {
+                legend: {
+                    display: false
+                }
+            },
+            scales: {
+                y: {
+                    beginAtZero: true,
+                    grid: {
+                        color: 'rgba(255, 255, 255, 0.1)'
+                    },
+                    ticks: {
+                        color: 'rgba(255, 255, 255, 0.7)'
+                    }
+                },
+                x: {
+                    grid: {
+                        color: 'rgba(255, 255, 255, 0.1)'
+                    },
+                    ticks: {
+                        color: 'rgba(255, 255, 255, 0.7)'
+                    }
+                }
+            }
+        }
+    });
+}
+
+function renderSubjectChart(subjectData) {
+    const ctx = document.getElementById('subjectChart').getContext('2d');
+    
+    if (charts.subject) {
+        charts.subject.destroy();
+    }
+    
+    const colors = [
+        '#3b82f6', '#10b981', '#f59e0b', '#ef4444', '#8b5cf6',
+        '#06b6d4', '#84cc16', '#f97316', '#ec4899', '#6366f1'
+    ];
+    
+    charts.subject = new Chart(ctx, {
+        type: 'doughnut',
+        data: {
+            labels: subjectData.map(d => d.subject_display),
+            datasets: [{
+                data: subjectData.map(d => d.hours),
+                backgroundColor: colors.slice(0, subjectData.length),
+                borderColor: colors.slice(0, subjectData.length),
+                borderWidth: 2,
+                hoverOffset: 4
+            }]
+        },
+        options: {
+            responsive: true,
+            maintainAspectRatio: false,
+            plugins: {
+                legend: {
+                    position: 'bottom',
+                    labels: {
+                        color: 'rgba(255, 255, 255, 0.8)',
+                        usePointStyle: true,
+                        padding: 15
+                    }
+                },
+                tooltip: {
+                    callbacks: {
+                        label: function(context) {
+                            const label = context.label || '';
+                            const value = context.parsed;
+                            const total = context.dataset.data.reduce((a, b) => a + b, 0);
+                            const percentage = ((value / total) * 100).toFixed(1);
+                            return `${label}: ${value}h (${percentage}%)`;
+                        }
+                    }
+                }
+            }
+        }
+    });
+}
+
+function displayGoals(goals) {
+    const container = document.getElementById('goalsContainer');
+    
+    if (goals.length === 0) {
+        container.innerHTML = `
+            <div class="empty-state">
+                <i class="fas fa-target" style="font-size: 3rem; color: rgba(255, 255, 255, 0.3); margin-bottom: 1rem;"></i>
+                <p style="color: rgba(255, 255, 255, 0.6);">No goals yet. Create your first goal to start tracking progress!</p>
+            </div>
+        `;
+        return;
+    }
+    
+    // Show only first 3 goals, sorted by priority
+    const sortedGoals = goals.sort((a, b) => {
+        const priorityOrder = { urgent: 4, high: 3, medium: 2, low: 1 };
+        return priorityOrder[b.priority] - priorityOrder[a.priority];
+    });
+    
+    const displayGoals = sortedGoals.slice(0, 3);
+    
+    container.innerHTML = displayGoals.map(goal => `
+        <div class="goal-item" onclick="openGoalDetail(${goal.id})">
+            <div class="goal-header">
+                <div class="goal-info">
+                    <div class="goal-title">${goal.title}</div>
+                    <div class="goal-meta">
+                        <span class="goal-badge priority-${goal.priority}">${goal.priority_display}</span>
+                        <span class="goal-badge status-${goal.status}">${goal.status_display}</span>
+                        ${goal.is_overdue ? '<span class="goal-badge priority-urgent">Overdue</span>' : ''}
+                        ${goal.days_remaining !== null ? `<span style="color: rgba(255, 255, 255, 0.6); font-size: 0.8rem;">${goal.days_remaining} days left</span>` : ''}
+                    </div>
+                </div>
+            </div>
+            
+            <div class="goal-progress">
+                <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 0.3rem;">
+                    <span style="color: rgba(255, 255, 255, 0.8); font-size: 0.9rem;">Progress</span>
+                    <span style="color: white; font-weight: 600;">${goal.progress_percentage}%</span>
+                </div>
+                <div class="goal-progress-bar">
+                    <div class="goal-progress-fill" style="width: ${goal.progress_percentage}%"></div>
+                </div>
+            </div>
+            
+            <div class="goal-actions" onclick="event.stopPropagation()">
+                <button class="goal-btn" onclick="updateGoalProgress(${goal.id}, ${Math.min(goal.progress_percentage + 10, 100)})">
+                    +10%
+                </button>
+                <button class="goal-btn" onclick="openGoalDetail(${goal.id})">
+                    Details
+                </button>
+            </div>
+        </div>
+    `).join('');
+}
+
+function displayRecentActivity(sessions) {
+    const activityFeed = document.getElementById('activityFeed');
+    
+    if (sessions.length === 0) {
+        activityFeed.innerHTML = `
+            <div class="empty-state">
+                <i class="fas fa-history" style="font-size: 2rem; color: rgba(255, 255, 255, 0.3); margin-bottom: 0.5rem;"></i>
+                <p style="color: rgba(255, 255, 255, 0.6); font-size: 0.9rem;">No recent activity</p>
+            </div>
+        `;
+        return;
+    }
+    
+    activityFeed.innerHTML = sessions.map(session => `
+        <div class="activity-item">
+            <div class="activity-header">
+                <span class="activity-icon">📚</span>
+                <span class="activity-title">Studied ${session.subject}</span>
+            </div>
+            <div class="activity-description">${session.title} (${session.duration_minutes} min)</div>
+            <div class="activity-time">${formatRelativeTime(session.date)}</div>
+        </div>
+    `).join('');
+}
+
+function displayAchievements(achievements) {
+    const container = document.getElementById('achievementsContainer');
+    
+    if (achievements.length === 0) {
+        container.innerHTML = `
+            <div class="empty-state">
+                <i class="fas fa-trophy" style="font-size: 2rem; color: rgba(255, 255, 255, 0.3); margin-bottom: 0.5rem;"></i>
+                <p style="color: rgba(255, 255, 255, 0.6); font-size: 0.9rem;">No achievements yet</p>
+            </div>
+        `;
+        return;
+    }
+    
+    container.innerHTML = achievements.map(achievement => `
+        <div class="achievement-item">
+            <div class="achievement-icon">${achievement.icon}</div>
+            <div class="achievement-content">
+                <div class="achievement-title">${achievement.title}</div>
+                <div class="achievement-description">${achievement.description}</div>
+            </div>
+            <div class="achievement-points">+${achievement.points}</div>
+        </div>
+    `).join('');
+}
+
+async function handleGoalSubmission(e) {
+    e.preventDefault();
+    
+    const submitBtn = e.target.querySelector('.submit-btn');
+    const originalText = submitBtn.textContent;
+    const formData = new FormData(e.target);
+    
+    submitBtn.textContent = 'Creating...';
+    submitBtn.disabled = true;
+    
+    try {
+        const response = await fetch('/api/create-goal/', {
+            method: 'POST',
+            body: formData,
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            submitBtn.textContent = 'Goal Created! ✓';
+            submitBtn.style.background = 'linear-gradient(135deg, #10b981, #059669)';
+            showNotification('Goal created successfully!', 'success');
+            
+            setTimeout(() => {
+                closeModal('goalModal');
+                e.target.reset();
+                submitBtn.textContent = originalText;
+                submitBtn.disabled = false;
+                submitBtn.style.background = 'linear-gradient(135deg, #3b82f6, #1d4ed8)';
+                loadGoals(); // Reload goals
+            }, 1500);
+        } else {
+            submitBtn.textContent = 'Try Again';
+            submitBtn.disabled = false;
+            showNotification('Please check your form and try again.', 'error');
+            
+            setTimeout(() => {
+                submitBtn.textContent = originalText;
+            }, 2000);
+        }
+    } catch (error) {
+        submitBtn.textContent = 'Try Again';
+        submitBtn.disabled = false;
+        showNotification('Something went wrong. Please try again.', 'error');
+        
+        setTimeout(() => {
+            submitBtn.textContent = originalText;
+        }, 2000);
+    }
+}
+
+async function handleSessionSubmission(e) {
+    e.preventDefault();
+    
+    const submitBtn = e.target.querySelector('.submit-btn');
+    const originalText = submitBtn.textContent;
+    const formData = new FormData(e.target);
+    
+    submitBtn.textContent = 'Logging...';
+    submitBtn.disabled = true;
+    
+    try {
+        const response = await fetch('/api/log-study-session/', {
+            method: 'POST',
+            body: formData,
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            submitBtn.textContent = 'Session Logged! ✓';
+            submitBtn.style.background = 'linear-gradient(135deg, #10b981, #059669)';
+            showNotification('Study session logged successfully!', 'success');
+            
+            setTimeout(() => {
+                closeModal('sessionModal');
+                e.target.reset();
+                submitBtn.textContent = originalText;
+                submitBtn.disabled = false;
+                submitBtn.style.background = 'linear-gradient(135deg, #3b82f6, #1d4ed8)';
+                
+                // Reset date to today
+                const today = new Date().toISOString().split('T')[0];
+                e.target.querySelector('input[name="date"]').value = today;
+                
+                loadProgressData(); // Reload all data
+            }, 1500);
+        } else {
+            submitBtn.textContent = 'Try Again';
+            submitBtn.disabled = false;
+            showNotification('Please check your form and try again.', 'error');
+            
+            setTimeout(() => {
+                submitBtn.textContent = originalText;
+            }, 2000);
+        }
+    } catch (error) {
+        submitBtn.textContent = 'Try Again';
+        submitBtn.disabled = false;
+        showNotification('Something went wrong. Please try again.', 'error');
+        
+        setTimeout(() => {
+            submitBtn.textContent = originalText;
+        }, 2000);
+    }
+}
+
+async function handleWeeklyGoalSubmission(e) {
+    e.preventDefault();
+    
+    const submitBtn = e.target.querySelector('.submit-btn');
+    const originalText = submitBtn.textContent;
+    const targetHours = e.target.querySelector('input[name="target_hours"]').value;
+    const targetSessions = e.target.querySelector('input[name="target_sessions"]').value;
+    
+    submitBtn.textContent = 'Setting...';
+    submitBtn.disabled = true;
+    
+    try {
+        const response = await fetch('/api/set-weekly-goals/', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-CSRFToken': getCookie('csrftoken')
+            },
+            body: JSON.stringify({
+                target_hours: parseFloat(targetHours),
+                target_sessions: parseInt(targetSessions)
+            })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            submitBtn.textContent = 'Goals Set! ✓';
+            submitBtn.style.background = 'linear-gradient(135deg, #10b981, #059669)';
+            showNotification('Weekly goals updated successfully!', 'success');
+            
+            setTimeout(() => {
+                closeModal('weeklyModal');
+                submitBtn.textContent = originalText;
+                submitBtn.disabled = false;
+                submitBtn.style.background = 'linear-gradient(135deg, #3b82f6, #1d4ed8)';
+                loadProgressData(); // Reload progress data
+            }, 1500);
+        } else {
+            submitBtn.textContent = 'Try Again';
+            submitBtn.disabled = false;
+            showNotification('Failed to set weekly goals', 'error');
+            
+            setTimeout(() => {
+                submitBtn.textContent = originalText;
+            }, 2000);
+        }
+    } catch (error) {
+        submitBtn.textContent = 'Try Again';
+        submitBtn.disabled = false;
+        showNotification('Something went wrong. Please try again.', 'error');
+        
+        setTimeout(() => {
+            submitBtn.textContent = originalText;
+        }, 2000);
+    }
+}
+
+async function updateGoalProgress(goalId, newProgress) {
+    try {
+        const response = await fetch(`/api/update-goal-progress/${goalId}/`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-CSRFToken': getCookie('csrftoken')
+            },
+            body: JSON.stringify({
+                progress_percentage: newProgress
+            })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            showNotification('Progress updated!', 'success');
+            loadGoals(); // Reload goals
+            
+            if (data.is_completed) {
+                showNotification('🎉 Goal completed! Achievement unlocked!', 'success');
+                loadProgressData(); // Reload all data for achievement update
+            }
+        } else {
+            showNotification('Failed to update progress', 'error');
+        }
+    } catch (error) {
+        console.error('Error updating goal progress:', error);
+        showNotification('Something went wrong', 'error');
+    }
+}
+
+async function openGoalDetail(goalId) {
+    try {
+        const response = await fetch(`/api/goal/${goalId}/`, {
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            displayGoalDetail(data.goal);
+            openModal('goalDetailModal');
+        } else {
+            showNotification('Failed to load goal details', 'error');
+        }
+    } catch (error) {
+        console.error('Error loading goal detail:', error);
+        showNotification('Something went wrong', 'error');
+    }
+}
+
+function displayGoalDetail(goal) {
+    document.getElementById('goalDetailTitle').textContent = goal.title;
+    
+    const content = document.getElementById('goalDetailContent');
+    content.innerHTML = `
+        <div class="goal-detail-header">
+            <div class="goal-detail-info">
+                <div class="goal-detail-title">${goal.title}</div>
+                <div class="goal-detail-meta">
+                    <span class="goal-badge priority-${goal.priority}">${goal.priority_display}</span>
+                    <span class="goal-badge status-${goal.status}">${goal.status_display}</span>
+                    ${goal.category ? `<span class="goal-badge">${goal.category_display}</span>` : ''}
+                    ${goal.is_overdue ? '<span class="goal-badge priority-urgent">Overdue</span>' : ''}
+                </div>
+                <div class="goal-detail-description">${goal.description || 'No description provided.'}</div>
+                ${goal.target_date ? `<p style="color: rgba(255, 255, 255, 0.7);"><strong>Target Date:</strong> ${formatDate(goal.target_date)}</p>` : ''}
+                ${goal.days_remaining !== null ? `<p style="color: rgba(255, 255, 255, 0.7);"><strong>Days Remaining:</strong> ${goal.days_remaining}</p>` : ''}
+            </div>
+            
+            <div class="goal-detail-actions">
+                <div class="progress-update">
+                    <h4>Update Progress</h4>
+                    <input type="range" min="0" max="100" value="${goal.progress_percentage}" 
+                           class="progress-slider" id="progressSlider" 
+                           oninput="updateProgressDisplay(this.value)">
+                    <div style="display: flex; justify-content: space-between; margin: 0.5rem 0;">
+                        <span style="color: rgba(255, 255, 255, 0.6);">0%</span>
+                        <span id="progressDisplay" style="color: white; font-weight: 600;">${goal.progress_percentage}%</span>
+                        <span style="color: rgba(255, 255, 255, 0.6);">100%</span>
+                    </div>
+                    <button class="submit-btn" onclick="saveGoalProgress(${goal.id})">
+                        Save Progress
+                    </button>
+                </div>
+                
+                <button class="goal-btn" style="width: 100%; margin-top: 1rem;" onclick="deleteGoal(${goal.id})">
+                    <i class="fas fa-trash"></i> Delete Goal
+                </button>
+            </div>
+        </div>
+        
+        ${goal.milestones && goal.milestones.length > 0 ? `
+            <div class="milestones-section">
+                <div class="milestones-header">
+                    <h4 style="color: white; margin: 0;">Milestones (${goal.completed_milestones}/${goal.milestones_count})</h4>
+                    <button class="header-btn" onclick="addMilestone(${goal.id})">
+                        <i class="fas fa-plus"></i>
+                    </button>
+                </div>
+                <div class="milestones-list">
+                    ${goal.milestones.map(milestone => `
+                        <div class="milestone-item">
+                            <div class="milestone-checkbox ${milestone.is_completed ? 'completed' : ''}" 
+                                 onclick="toggleMilestone(${milestone.id})">
+                                ${milestone.is_completed ? '<i class="fas fa-check"></i>' : ''}
+                            </div>
+                            <div class="milestone-content">
+                                <div class="milestone-title">${milestone.title}</div>
+                                ${milestone.due_date ? `<div class="milestone-due">Due: ${formatDate(milestone.due_date)}</div>` : ''}
+                            </div>
+                        </div>
+                    `).join('')}
+                </div>
+            </div>
+        ` : ''}
+    `;
+}
+
+function updateProgressDisplay(value) {
+    document.getElementById('progressDisplay').textContent = value + '%';
+}
+
+async function saveGoalProgress(goalId) {
+    const progressSlider = document.getElementById('progressSlider');
+    const newProgress = parseInt(progressSlider.value);
+    
+    try {
+        const response = await fetch(`/api/update-goal-progress/${goalId}/`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-CSRFToken': getCookie('csrftoken')
+            },
+            body: JSON.stringify({
+                progress_percentage: newProgress
+            })
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            showNotification('Progress updated successfully!', 'success');
+            loadGoals(); // Reload goals
+            
+            if (data.is_completed) {
+                showNotification('🎉 Congratulations! Goal completed!', 'success');
+                setTimeout(() => {
+                    closeModal('goalDetailModal');
+                    loadProgressData(); // Reload all data
+                }, 2000);
+            }
+        } else {
+            showNotification('Failed to update progress', 'error');
+        }
+    } catch (error) {
+        console.error('Error updating progress:', error);
+        showNotification('Something went wrong', 'error');
+    }
+}
+
+async function deleteGoal(goalId) {
+    if (!confirm('Are you sure you want to delete this goal? This action cannot be undone.')) {
+        return;
+    }
+    
+    try {
+        const response = await fetch(`/api/delete-goal/${goalId}/`, {
+            method: 'DELETE',
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            showNotification('Goal deleted successfully', 'success');
+            closeModal('goalDetailModal');
+            loadGoals(); // Reload goals
+        } else {
+            showNotification('Failed to delete goal', 'error');
+        }
+    } catch (error) {
+        console.error('Error deleting goal:', error);
+        showNotification('Something went wrong', 'error');
+    }
+}
+
+async function toggleMilestone(milestoneId) {
+    try {
+        const response = await fetch(`/api/toggle-milestone/${milestoneId}/`, {
+            method: 'POST',
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-CSRFToken': getCookie('csrftoken')
+            }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+            showNotification(data.message, 'success');
+            // Reload the current goal detail
+            const goalId = getCurrentGoalId();
+            if (goalId) {
+                openGoalDetail(goalId);
+            }
+        } else {
+            showNotification('Failed to update milestone', 'error');
+        }
+    } catch (error) {
+        console.error('Error toggling milestone:', error);
+        showNotification('Something went wrong', 'error');
+    }
+}
+
+function getCurrentGoalId() {
+    // Extract goal ID from current goal detail modal if open
+    const goalDetailModal = document.getElementById('goalDetailModal');
+    if (goalDetailModal.style.display === 'block') {
+        const firstMilestone = goalDetailModal.querySelector('.milestone-checkbox');
+        if (firstMilestone) {
+            const onclickAttr = firstMilestone.getAttribute('onclick');
+            const match = onclickAttr.match(/toggleMilestone\((\d+)\)/);
+            if (match) {
+                const milestoneId = parseInt(match[1]);
+                // Find goal that contains this milestone
+                return currentGoals.find(goal => 
+                    goal.milestones && goal.milestones.some(m => m.id === milestoneId)
+                )?.id;
+            }
+        }
+    }
+    return null;
+}
+
+function showAllGoals() {
+    // You can expand this to show a dedicated goals page or expand the current view
+    if (currentGoals.length <= 3) {
+        showNotification('All goals are already displayed', 'info');
+        return;
+    }
+    
+    const container = document.getElementById('goalsContainer');
+    displayGoals(currentGoals); // Show all goals instead of just first 3
+    
+    // Update the view all button
+    const viewAllBtn = document.querySelector('.view-all button');
+    viewAllBtn.textContent = 'Show Less';
+    viewAllBtn.onclick = () => {
+        displayGoals(currentGoals.slice(0, 3));
+        viewAllBtn.textContent = 'View All Goals';
+        viewAllBtn.onclick = showAllGoals;
+    };
+}
+
+// Modal Management
+function openModal(modalId) {
+    document.getElementById(modalId).style.display = 'block';
+    document.body.style.overflow = 'hidden';
+}
+
+function closeModal(modalId) {
+    document.getElementById(modalId).style.display = 'none';
+    document.body.style.overflow = 'auto';
+}
+
+// Utility Functions
+function formatRelativeTime(dateString) {
+    const date = new Date(dateString);
+    const now = new Date();
+    const diffInSeconds = Math.floor((now - date) / 1000);
+    
+    if (diffInSeconds < 60) return 'Just now';
+    if (diffInSeconds < 3600) return `${Math.floor(diffInSeconds / 60)} minutes ago`;
+    if (diffInSeconds < 86400) return `${Math.floor(diffInSeconds / 3600)} hours ago`;
+    if (diffInSeconds < 604800) return `${Math.floor(diffInSeconds / 86400)} days ago`;
+    
+    return date.toLocaleDateString();
+}
+
+function formatDate(dateString) {
+    const date = new Date(dateString);
+    return date.toLocaleDateString('en-US', {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric'
+    });
+}
+
+function getCookie(name) {
+    let cookieValue = null;
+    if (document.cookie && document.cookie !== '') {
+        const cookies = document.cookie.split(';');
+        for (let i = 0; i < cookies.length; i++) {
+            const cookie = cookies[i].trim();
+            if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                break;
+            }
+        }
+    }
+    return cookieValue;
+}
+
+function showLoading() {
+    // Add loading spinner if needed
+    const container = document.querySelector('.progress-container');
+    if (!container.querySelector('.loading-spinner')) {
+        const spinner = document.createElement('div');
+        spinner.className = 'loading-spinner';
+        spinner.innerHTML = '<i class="fas fa-spinner fa-spin" style="font-size: 2rem; color: #3b82f6;"></i>';
+        spinner.style.cssText = 'position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); z-index: 3000;';
+        document.body.appendChild(spinner);
+    }
+}
+
+function hideLoading() {
+    const spinner = document.querySelector('.loading-spinner');
+    if (spinner) {
+        spinner.remove();
+    }
+}
+
+// Enhanced notification function (extends the one in index.js)
+function showNotification(message, type) {
+    const notification = document.createElement('div');
+    notification.className = `notification notification-${type}`;
+    notification.textContent = message;
+
+    // Add icon based on type
+    const icon = document.createElement('i');
+    switch(type) {
+        case 'success':
+            icon.className = 'fas fa-check-circle';
+            break;
+        case 'error':
+            icon.className = 'fas fa-exclamation-circle';
+            break;
+        case 'info':
+            icon.className = 'fas fa-info-circle';
+            break;
+        default:
+            icon.className = 'fas fa-bell';
+    }
+    
+    notification.insertBefore(icon, notification.firstChild);
+    notification.insertBefore(document.createTextNode(' '), notification.firstChild.nextSibling);
+
+    document.body.appendChild(notification);
+
+    setTimeout(() => {
+        notification.classList.add('show');
+    }, 100);
+
+    setTimeout(() => {
+        notification.classList.remove('show');
+        setTimeout(() => {
+            if (notification.parentNode) {
+                document.body.removeChild(notification);
+            }
+        }, 300);
+    }, 4000);
+}
\ No newline at end of file
diff --git a/core/templates/dashboard.html b/core/templates/dashboard.html
index c42dbe06..c80f8195 100644
--- a/core/templates/dashboard.html
+++ b/core/templates/dashboard.html
@@ -93,8 +93,10 @@ <h3 class="feature-title">Study Materials</h3>
                 <div class="feature-card">
                     <div class="feature-icon">📈</div>
                     <h3 class="feature-title">Progress Tracking</h3>
-                    <p class="feature-description">Monitor your learning progress and achievements.</p>
-                    <button class="submit-btn" style="margin-top: 1rem;">Coming Soon</button>
+                    <p class="feature-description">Monitor your learning progress, set goals, and track achievements with detailed analytics.</p>
+                    <a href="{% url 'progress_tracking' %}">
+                        <button class="submit-btn" style="margin-top: 1rem;">Track Progress</button>
+                    </a>
                 </div>
                 
                 <div class="feature-card">
diff --git a/core/templates/progress.html b/core/templates/progress.html
new file mode 100644
index 00000000..80714c69
--- /dev/null
+++ b/core/templates/progress.html
@@ -0,0 +1,494 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Progress Tracking - PeerPrep</title>
+    <link rel="stylesheet" href="{% static 'css/index.css' %}">
+    <link rel="stylesheet" href="{% static 'css/progress.css' %}">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+</head>
+<body>
+    <!-- Background Orbs -->
+    <div class="bg-orb bg-orb-1"></div>
+    <div class="bg-orb bg-orb-2"></div>
+    <div class="bg-orb bg-orb-3"></div>
+    <div class="bg-orb bg-orb-4"></div>
+
+    <!-- Navbar -->
+    <nav class="navbar">
+        <div class="nav-container">
+            <div class="logo">
+                <img src="/static/PeerPrep.png" alt="PeerPrep Logo">
+            </div>
+            <ul class="nav-menu">
+                <button class="mode-toggle" id="modeToggle" title="Toggle Mode" onclick="toggleMode()">
+                    <i class="fas fa-moon"></i>
+                </button>
+                <li><a href="{% url 'dashboard' %}" class="nav-link">Dashboard</a></li>
+                <li><a href="{% url 'progress_tracking' %}" class="nav-link active">Progress</a></li>
+                <li><a href="{% url 'questions' %}" class="nav-link">Q&A</a></li>
+                <li><a href="{% url 'success_stories' %}" class="nav-link">Stories</a></li>
+                <li>
+                    <form method="post" action="{% url 'logout' %}" style="display:inline;">
+                        {% csrf_token %}
+                        <button type="submit" class="nav-link" style="background:none; border:none; color:white; font-size:1rem; cursor:pointer;">
+                            Logout
+                        </button>
+                    </form>
+                </li>
+            </ul>
+        </div>
+    </nav>
+
+    <!-- Main Content -->
+    <main class="main-content">
+        <div class="progress-container">
+            <!-- Header -->
+            <div class="progress-header">
+                <h1 class="main-title">Progress Tracking</h1>
+                <p class="subtitle">Monitor your learning journey and achieve your goals</p>
+                
+                <!-- Quick Actions -->
+                <div class="quick-actions">
+                    <button class="action-btn" onclick="openModal('goalModal')">
+                        <i class="fas fa-target"></i>
+                        New Goal
+                    </button>
+                    <button class="action-btn" onclick="openModal('sessionModal')">
+                        <i class="fas fa-book"></i>
+                        Log Session
+                    </button>
+                    <button class="action-btn" onclick="openModal('weeklyModal')">
+                        <i class="fas fa-calendar-week"></i>
+                        Weekly Goals
+                    </button>
+                </div>
+            </div>
+
+            <!-- Statistics Cards -->
+            <div class="stats-grid">
+                <div class="stat-card">
+                    <div class="stat-icon">
+                        <i class="fas fa-clock"></i>
+                    </div>
+                    <div class="stat-content">
+                        <h3 id="totalHours">0</h3>
+                        <p>Study Hours</p>
+                    </div>
+                </div>
+                
+                <div class="stat-card">
+                    <div class="stat-icon">
+                        <i class="fas fa-target"></i>
+                    </div>
+                    <div class="stat-content">
+                        <h3 id="completedGoals">0</h3>
+                        <p>Goals Completed</p>
+                    </div>
+                </div>
+                
+                <div class="stat-card">
+                    <div class="stat-icon">
+                        <i class="fas fa-fire"></i>
+                    </div>
+                    <div class="stat-content">
+                        <h3 id="currentStreak">0</h3>
+                        <p>Day Streak</p>
+                    </div>
+                </div>
+                
+                <div class="stat-card">
+                    <div class="stat-icon">
+                        <i class="fas fa-trophy"></i>
+                    </div>
+                    <div class="stat-content">
+                        <h3 id="achievementPoints">0</h3>
+                        <p>Points Earned</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Main Content Grid -->
+            <div class="content-grid">
+                <!-- Left Column -->
+                <div class="left-column">
+                    <!-- Weekly Progress -->
+                    <div class="progress-card">
+                        <div class="card-header">
+                            <h3>This Week's Progress</h3>
+                            <button class="header-btn" onclick="openModal('weeklyModal')">
+                                <i class="fas fa-cog"></i>
+                            </button>
+                        </div>
+                        
+                        <div class="weekly-stats">
+                            <div class="weekly-stat">
+                                <span class="stat-label">Study Hours</span>
+                                <div class="progress-bar">
+                                    <div class="progress-fill" id="weeklyHoursProgress"></div>
+                                </div>
+                                <span class="stat-value" id="weeklyHoursText">0 / 10 hrs</span>
+                            </div>
+                            
+                            <div class="weekly-stat">
+                                <span class="stat-label">Study Sessions</span>
+                                <div class="progress-bar">
+                                    <div class="progress-fill" id="weeklySessionsProgress"></div>
+                                </div>
+                                <span class="stat-value" id="weeklySessionsText">0 / 5 sessions</span>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- Daily Study Time Chart -->
+                    <div class="progress-card">
+                        <div class="card-header">
+                            <h3>Daily Study Time</h3>
+                            <span class="time-period">Last 7 days</span>
+                        </div>
+                        <div class="chart-container">
+                            <canvas id="dailyChart"></canvas>
+                        </div>
+                    </div>
+
+                    <!-- Subject Distribution -->
+                    <div class="progress-card">
+                        <div class="card-header">
+                            <h3>Subject Distribution</h3>
+                            <span class="time-period">Last 30 days</span>
+                        </div>
+                        <div class="chart-container">
+                            <canvas id="subjectChart"></canvas>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Right Column -->
+                <div class="right-column">
+                    <!-- Goals Overview -->
+                    <div class="progress-card">
+                        <div class="card-header">
+                            <h3>My Goals</h3>
+                            <button class="header-btn" onclick="openModal('goalModal')">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                        
+                        <div class="goals-container" id="goalsContainer">
+                            <!-- Goals will be loaded here -->
+                        </div>
+                        
+                        <div class="view-all">
+                            <button onclick="showAllGoals()">View All Goals</button>
+                        </div>
+                    </div>
+
+                    <!-- Recent Activity -->
+                    <div class="progress-card">
+                        <div class="card-header">
+                            <h3>Recent Activity</h3>
+                        </div>
+                        <div class="activity-feed" id="activityFeed">
+                            <!-- Activity items will be loaded here -->
+                        </div>
+                    </div>
+
+                    <!-- Recent Achievements -->
+                    <div class="progress-card">
+                        <div class="card-header">
+                            <h3>Recent Achievements</h3>
+                        </div>
+                        <div class="achievements-container" id="achievementsContainer">
+                            <!-- Achievements will be loaded here -->
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </main>
+
+    <div id="goalModal" class="modal">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h2>Create New Goal</h2>
+            <span class="close" onclick="closeModal('goalModal')">&times;</span>
+        </div>
+        
+        <div class="modal-form-container">
+            <form id="goalForm">
+                {% csrf_token %}
+                <div class="form-grid">
+                    <div class="form-group full-width">
+                        <label class="form-label">Goal Title <span class="required">*</span></label>
+                        <input type="text" name="title" class="form-input" placeholder="e.g., Master Python Programming" required>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Category <span class="required">*</span></label>
+                        <select name="category" class="form-input" required>
+                            <option value="">Select Category</option>
+                            <option value="academic">Academic</option>
+                            <option value="skill">Skill Development</option>
+                            <option value="career">Career</option>
+                            <option value="personal">Personal Growth</option>
+                            <option value="health">Health & Fitness</option>
+                            <option value="creative">Creative</option>
+                            <option value="other">Other</option>
+                        </select>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Priority <span class="required">*</span></label>
+                        <select name="priority" class="form-input" required>
+                            <option value="low">Low</option>
+                            <option value="medium" selected>Medium</option>
+                            <option value="high">High</option>
+                            <option value="urgent">Urgent</option>
+                        </select>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Target Date</label>
+                        <input type="date" name="target_date" class="form-input">
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Description</label>
+                        <textarea name="description" class="form-textarea" placeholder="Describe your goal in detail..." rows="3"></textarea>
+                    </div>
+                </div>
+                
+                <div class="modal-actions">
+                    <button type="button" onclick="closeModal('goalModal')" class="btn-secondary">Cancel</button>
+                    <button type="submit" class="submit-btn">Create Goal</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<!-- Study Session Modal - Updated Structure -->
+<div id="sessionModal" class="modal">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h2>Log Study Session</h2>
+            <span class="close" onclick="closeModal('sessionModal')">&times;</span>
+        </div>
+        
+        <div class="modal-form-container">
+            <form id="sessionForm">
+                {% csrf_token %}
+                <div class="form-grid">
+                    <div class="form-group">
+                        <label class="form-label">Subject <span class="required">*</span></label>
+                        <select name="subject" class="form-input" required>
+                            <option value="">Select Subject</option>
+                            <option value="math">Mathematics</option>
+                            <option value="science">Science</option>
+                            <option value="physics">Physics</option>
+                            <option value="chemistry">Chemistry</option>
+                            <option value="biology">Biology</option>
+                            <option value="computer_science">Computer Science</option>
+                            <option value="programming">Programming</option>
+                            <option value="english">English</option>
+                            <option value="history">History</option>
+                            <option value="other">Other</option>
+                        </select>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Duration (minutes) <span class="required">*</span></label>
+                        <input type="number" name="duration_minutes" class="form-input" min="1" max="480" placeholder="60" required>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Session Title <span class="required">*</span></label>
+                        <input type="text" name="title" class="form-input" placeholder="e.g., Algebra Practice Session" required>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Date <span class="required">*</span></label>
+                        <input type="date" name="date" class="form-input" required>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Productivity (1-10) <span class="required">*</span></label>
+                        <input type="number" name="productivity_rating" class="form-input" min="1" max="10" value="5" required>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Description</label>
+                        <textarea name="description" class="form-textarea" placeholder="What did you study?" rows="2"></textarea>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Notes</label>
+                        <textarea name="notes" class="form-textarea" placeholder="Any notes or reflections..." rows="3"></textarea>
+                    </div>
+                </div>
+                
+                <div class="modal-actions">
+                    <button type="button" onclick="closeModal('sessionModal')" class="btn-secondary">Cancel</button>
+                    <button type="submit" class="submit-btn">Log Session</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<!-- Weekly Goals Modal - Updated Structure -->
+<div id="weeklyModal" class="modal">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h2>Set Weekly Goals</h2>
+            <span class="close" onclick="closeModal('weeklyModal')">&times;</span>
+        </div>
+        
+        <div class="modal-form-container">
+            <form id="weeklyForm">
+                {% csrf_token %}
+                <div class="form-group">
+                    <label class="form-label">Target Study Hours <span class="required">*</span></label>
+                    <input type="number" id="targetHours" name="target_hours" class="form-input" step="0.5" min="0.5" max="60" value="10" required>
+                    <small style="color: rgba(255, 255, 255, 0.6); margin-top: 0.5rem; display: block;">Hours you want to study this week</small>
+                </div>
+                
+                <div class="form-group">
+                    <label class="form-label">Target Study Sessions <span class="required">*</span></label>
+                    <input type="number" id="targetSessions" name="target_sessions" class="form-input" min="1" max="20" value="5" required>
+                    <small style="color: rgba(255, 255, 255, 0.6); margin-top: 0.5rem; display: block;">Number of study sessions this week</small>
+                </div>
+                
+                <div class="modal-actions">
+                    <button type="button" onclick="closeModal('weeklyModal')" class="btn-secondary">Cancel</button>
+                    <button type="submit" class="submit-btn">Set Goals</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+    <!-- Study Session Modal -->
+    <div id="sessionModal" class="modal">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h2>Log Study Session</h2>
+                <span class="close" onclick="closeModal('sessionModal')">&times;</span>
+            </div>
+            <form id="sessionForm">
+                {% csrf_token %}
+                <div class="form-grid">
+                    <div class="form-group">
+                        <label class="form-label">Subject <span class="required">*</span></label>
+                        <select name="subject" class="form-input" required>
+                            <option value="">Select Subject</option>
+                            <option value="math">Mathematics</option>
+                            <option value="science">Science</option>
+                            <option value="physics">Physics</option>
+                            <option value="chemistry">Chemistry</option>
+                            <option value="biology">Biology</option>
+                            <option value="computer_science">Computer Science</option>
+                            <option value="programming">Programming</option>
+                            <option value="english">English</option>
+                            <option value="history">History</option>
+                            <option value="other">Other</option>
+                        </select>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Duration (minutes) <span class="required">*</span></label>
+                        <input type="number" name="duration_minutes" class="form-input" min="1" max="480" placeholder="60" required>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Session Title <span class="required">*</span></label>
+                        <input type="text" name="title" class="form-input" placeholder="e.g., Algebra Practice Session" required>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Date <span class="required">*</span></label>
+                        <input type="date" name="date" class="form-input" required>
+                    </div>
+                    
+                    <div class="form-group">
+                        <label class="form-label">Productivity (1-10) <span class="required">*</span></label>
+                        <input type="number" name="productivity_rating" class="form-input" min="1" max="10" value="5" required>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Description</label>
+                        <textarea name="description" class="form-textarea" placeholder="What did you study?" rows="2"></textarea>
+                    </div>
+                    
+                    <div class="form-group full-width">
+                        <label class="form-label">Notes</label>
+                        <textarea name="notes" class="form-textarea" placeholder="Any notes or reflections..." rows="3"></textarea>
+                    </div>
+                </div>
+                
+                <div class="modal-actions">
+                    <button type="button" onclick="closeModal('sessionModal')" class="btn-secondary">Cancel</button>
+                    <button type="submit" class="submit-btn">Log Session</button>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <!-- Weekly Goals Modal -->
+    <div id="weeklyModal" class="modal">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h2>Set Weekly Goals</h2>
+                <span class="close" onclick="closeModal('weeklyModal')">&times;</span>
+            </div>
+            <form id="weeklyForm">
+                {% csrf_token %}
+                <div class="form-group">
+                    <label class="form-label">Target Study Hours <span class="required">*</span></label>
+                    <input type="number" id="targetHours" name="target_hours" class="form-input" step="0.5" min="0.5" max="60" value="10" required>
+                </div>
+                
+                <div class="form-group">
+                    <label class="form-label">Target Study Sessions <span class="required">*</span></label>
+                    <input type="number" id="targetSessions" name="target_sessions" class="form-input" min="1" max="20" value="5" required>
+                </div>
+                
+                <div class="modal-actions">
+                    <button type="button" onclick="closeModal('weeklyModal')" class="btn-secondary">Cancel</button>
+                    <button type="submit" class="submit-btn">Set Goals</button>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <!-- Goal Detail Modal -->
+    <div id="goalDetailModal" class="modal">
+        <div class="modal-content large">
+            <div class="modal-header">
+                <h2 id="goalDetailTitle">Goal Details</h2>
+                <span class="close" onclick="closeModal('goalDetailModal')">&times;</span>
+            </div>
+            
+            <div id="goalDetailContent">
+                <!-- Goal details will be loaded here -->
+            </div>
+        </div>
+    </div>
+
+    {% include "footer.html" %}
+    
+    <script src="{% static 'js/index.js' %}"></script>
+    <script src="{% static 'js/progress.js' %}"></script>
+
+    <script>
+        // Set today's date as default for session form
+        document.addEventListener('DOMContentLoaded', function() {
+            const today = new Date().toISOString().split('T')[0];
+            document.querySelector('input[name="date"]').value = today;
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/core/urls.py b/core/urls.py
index b1f5ce50..8e55cc32 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -34,4 +34,17 @@
      path('faq/', views.faq_view, name='faq'),
        path('faq/add/', views.add_faq, name='add_faq'),
           path('faq/delete/<int:faq_id>/', views.delete_faq, name='delete_faq'),
+    # Progress Tracking URLs
+    path('progress/', views.progress_tracking, name='progress_tracking'),
+    path('api/progress-dashboard/', views.get_progress_dashboard_data, name='api_progress_dashboard'),
+    path('api/goals/', views.get_goals, name='api_goals'),
+    path('api/create-goal/', views.create_goal, name='api_create_goal'),
+    path('api/goal/<int:goal_id>/', views.get_goal_detail, name='api_goal_detail'),
+    path('api/update-goal-progress/<int:goal_id>/', views.update_goal_progress, name='api_update_goal_progress'),
+    path('api/delete-goal/<int:goal_id>/', views.delete_goal, name='api_delete_goal'),
+    path('api/log-study-session/', views.log_study_session, name='api_log_study_session'),
+    path('api/set-weekly-goals/', views.set_weekly_goal, name='api_set_weekly_goals'),
+    path('api/create-milestone/<int:goal_id>/', views.create_milestone, name='api_create_milestone'),
+    path('api/toggle-milestone/<int:milestone_id>/', views.toggle_milestone, name='api_toggle_milestone'),
+    path('api/recent-activity/', views.get_recent_activity, name='api_recent_activity'),
 ]
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index 630e0ae9..f17f485f 100644
--- a/core/views.py
+++ b/core/views.py
@@ -12,7 +12,12 @@
 from .models import FAQ
 from .forms import FAQForm 
 from django.contrib.auth.decorators import user_passes_test
-
+from django.db.models import Sum, Avg, Count, Q
+from django.utils import timezone
+from datetime import datetime, timedelta
+import json
+from .models import Goal, Milestone, StudySession, Achievement, UserStats, WeeklyGoal
+from .forms import GoalForm, MilestoneForm, StudySessionForm, WeeklyGoalForm, GoalUpdateForm
 
 def user_login(request):
     if request.method == 'POST':
@@ -547,4 +552,570 @@ def add_faq(request):
 def delete_faq(request, faq_id):
     faq = FAQ.objects.get(id=faq_id)
     faq.delete()
-    return redirect('faq')
\ No newline at end of file
+    return redirect('faq')
+
+@login_required
+def progress_tracking(request):
+    """Main progress tracking dashboard"""
+    return render(request, 'progress.html')
+
+@login_required
+def get_progress_dashboard_data(request):
+    """Get all dashboard data in one API call"""
+    try:
+        user = request.user
+        
+        # Get or create user stats
+        stats, created = UserStats.objects.get_or_create(user=user)
+        if created:
+            stats.update_streak()
+        
+        # Goals data
+        goals = Goal.objects.filter(user=user)
+        total_goals = goals.count()
+        completed_goals = goals.filter(is_completed=True).count()
+        active_goals = goals.filter(status='in_progress').count()
+        overdue_goals = goals.filter(
+            target_date__lt=timezone.now().date(),
+            is_completed=False
+        ).count()
+        
+        # Recent study sessions
+        recent_sessions = StudySession.objects.filter(
+            user=user,
+            date__gte=timezone.now().date() - timedelta(days=7)
+        ).order_by('-date', '-created_at')[:5]
+        
+        # Weekly progress
+        today = timezone.now().date()
+        week_start = today - timedelta(days=today.weekday())
+        current_week, created = WeeklyGoal.objects.get_or_create(
+            user=user,
+            week_start=week_start,
+            defaults={'target_study_hours': 10.0, 'target_sessions': 5}
+        )
+        
+        # Calculate actual weekly progress
+        week_sessions = StudySession.objects.filter(
+            user=user,
+            date__gte=week_start,
+            date__lt=week_start + timedelta(days=7)
+        )
+        current_week.actual_study_hours = sum(session.duration_minutes for session in week_sessions) / 60.0
+        current_week.actual_sessions = week_sessions.count()
+        current_week.save()
+        
+        # Recent achievements
+        recent_achievements = Achievement.objects.filter(user=user).order_by('-earned_at')[:5]
+        
+        # Study time by subject (last 30 days)
+        subject_data = StudySession.objects.filter(
+            user=user,
+            date__gte=timezone.now().date() - timedelta(days=30)
+        ).values('subject').annotate(
+            total_minutes=Sum('duration_minutes'),
+            session_count=Count('id')
+        ).order_by('-total_minutes')
+        
+        # Daily study time (last 7 days)
+        daily_data = []
+        for i in range(6, -1, -1):
+            date = timezone.now().date() - timedelta(days=i)
+            day_sessions = StudySession.objects.filter(user=user, date=date)
+            total_minutes = sum(session.duration_minutes for session in day_sessions)
+            daily_data.append({
+                'date': date.isoformat(),
+                'day': date.strftime('%a'),
+                'hours': round(total_minutes / 60.0, 1),
+                'sessions': day_sessions.count()
+            })
+        
+        return JsonResponse({
+            'success': True,
+            'stats': {
+                'total_study_hours': round(stats.total_study_hours, 1),
+                'total_goals_completed': stats.total_goals_completed,
+                'current_streak_days': stats.current_streak_days,
+                'achievement_points': stats.achievement_points,
+                'total_goals': total_goals,
+                'active_goals': active_goals,
+                'overdue_goals': overdue_goals,
+            },
+            'weekly_progress': {
+                'target_hours': current_week.target_study_hours,
+                'actual_hours': round(current_week.actual_study_hours, 1),
+                'target_sessions': current_week.target_sessions,
+                'actual_sessions': current_week.actual_sessions,
+                'progress_percentage': round(current_week.progress_percentage(), 1)
+            },
+            'recent_sessions': [{
+                'id': session.id,
+                'title': session.title,
+                'subject': session.get_subject_display(),
+                'duration_minutes': session.duration_minutes,
+                'productivity_rating': session.productivity_rating,
+                'date': session.date.isoformat(),
+            } for session in recent_sessions],
+            'recent_achievements': [{
+                'title': achievement.title,
+                'description': achievement.description,
+                'icon': achievement.icon,
+                'points': achievement.points,
+                'earned_at': achievement.earned_at.isoformat(),
+            } for achievement in recent_achievements],
+            'subject_data': [{
+                'subject': item['subject'],
+                'subject_display': dict(StudySession.SUBJECT_CHOICES)[item['subject']],
+                'hours': round(item['total_minutes'] / 60.0, 1),
+                'sessions': item['session_count']
+            } for item in subject_data],
+            'daily_data': daily_data
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+def get_goals(request):
+    """Get user's goals"""
+    try:
+        goals = Goal.objects.filter(user=request.user).prefetch_related('milestones')
+        goals_data = []
+        
+        for goal in goals:
+            goals_data.append({
+                'id': goal.id,
+                'title': goal.title,
+                'description': goal.description,
+                'category': goal.category,
+                'category_display': goal.get_category_display(),
+                'priority': goal.priority,
+                'priority_display': goal.get_priority_display(),
+                'status': goal.status,
+                'status_display': goal.get_status_display(),
+                'progress_percentage': goal.progress_percentage,
+                'target_date': goal.target_date.isoformat() if goal.target_date else None,
+                'is_completed': goal.is_completed,
+                'is_overdue': goal.is_overdue(),
+                'days_remaining': goal.days_remaining(),
+                'created_at': goal.created_at.isoformat(),
+                'milestones_count': goal.milestones.count(),
+                'completed_milestones': goal.milestones.filter(is_completed=True).count(),
+            })
+        
+        return JsonResponse({'success': True, 'goals': goals_data})
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+@require_POST
+def create_goal(request):
+    """Create a new goal"""
+    try:
+        form = GoalForm(request.POST)
+        if form.is_valid():
+            goal = form.save(commit=False)
+            goal.user = request.user
+            goal.save()
+            
+            return JsonResponse({
+                'success': True,
+                'message': 'Goal created successfully!',
+                'goal_id': goal.id
+            })
+        
+        return JsonResponse({
+            'success': False,
+            'errors': form.errors
+        }, status=400)
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+@require_POST
+def update_goal_progress(request, goal_id):
+    """Update goal progress"""
+    try:
+        goal = get_object_or_404(Goal, id=goal_id, user=request.user)
+        data = json.loads(request.body)
+        
+        progress = data.get('progress_percentage', goal.progress_percentage)
+        status = data.get('status', goal.status)
+        
+        if not (0 <= progress <= 100):
+            return JsonResponse({'success': False, 'error': 'Progress must be between 0 and 100'})
+        
+        goal.progress_percentage = progress
+        goal.status = status
+        goal.save()
+        
+        # Check for achievements
+        if goal.is_completed and not Achievement.objects.filter(
+            user=request.user,
+            achievement_type='goal_completed',
+            related_goal=goal
+        ).exists():
+            Achievement.objects.create(
+                user=request.user,
+                title=f'Goal Completed: {goal.title}',
+                description=f'Successfully completed the goal "{goal.title}"',
+                achievement_type='goal_completed',
+                icon='🎯',
+                points=20,
+                related_goal=goal
+            )
+            
+            # Update user stats
+            stats, created = UserStats.objects.get_or_create(user=request.user)
+            stats.total_goals_completed += 1
+            stats.achievement_points += 20
+            stats.save()
+        
+        return JsonResponse({
+            'success': True,
+            'message': 'Goal updated successfully!',
+            'is_completed': goal.is_completed
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+@require_POST
+def log_study_session(request):
+    """Log a new study session"""
+    try:
+        form = StudySessionForm(request.POST)
+        if form.is_valid():
+            session = form.save(commit=False)
+            session.user = request.user
+            session.save()
+            
+            # Update user stats
+            stats, created = UserStats.objects.get_or_create(user=request.user)
+            stats.total_study_hours += session.duration_minutes / 60.0
+            stats.update_streak()
+            stats.save()
+            
+            # Check for streak achievements
+            if stats.current_streak_days in [7, 14, 30, 60, 100] and not Achievement.objects.filter(
+                user=request.user,
+                title=f'{stats.current_streak_days} Day Study Streak'
+            ).exists():
+                Achievement.objects.create(
+                    user=request.user,
+                    title=f'{stats.current_streak_days} Day Study Streak',
+                    description=f'Maintained a {stats.current_streak_days} day study streak!',
+                    achievement_type='streak',
+                    icon='🔥',
+                    points=stats.current_streak_days // 7 * 10
+                )
+                stats.achievement_points += stats.current_streak_days // 7 * 10
+                stats.save()
+            
+            return JsonResponse({
+                'success': True,
+                'message': 'Study session logged successfully!',
+                'session_id': session.id
+            })
+        
+        return JsonResponse({
+            'success': False,
+            'errors': form.errors
+        }, status=400)
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+def get_analytics_data(request):
+    """Get detailed analytics data"""
+    try:
+        user = request.user
+        
+        # Time range for analysis
+        end_date = timezone.now().date()
+        start_date = end_date - timedelta(days=30)
+        
+        # Study patterns
+        sessions = StudySession.objects.filter(
+            user=user,
+            date__gte=start_date
+        )
+        
+        # Productivity trends
+        productivity_by_day = []
+        for i in range(29, -1, -1):
+            date = end_date - timedelta(days=i)
+            day_sessions = sessions.filter(date=date)
+            avg_productivity = day_sessions.aggregate(
+                avg=Avg('productivity_rating')
+            )['avg'] or 0
+            total_minutes = sum(s.duration_minutes for s in day_sessions)
+            
+            productivity_by_day.append({
+                'date': date.isoformat(),
+                'day': date.strftime('%a'),
+                'productivity': round(avg_productivity, 1),
+                'study_time': round(total_minutes / 60.0, 1),
+                'sessions': day_sessions.count()
+            })
+        
+        # Subject distribution
+        subject_stats = sessions.values('subject').annotate(
+            total_minutes=Sum('duration_minutes'),
+            session_count=Count('id'),
+            avg_productivity=Avg('productivity_rating')
+        ).order_by('-total_minutes')
+        
+        # Goal completion rates by category
+        goal_stats = Goal.objects.filter(user=user).values('category').annotate(
+            total=Count('id'),
+            completed=Count('id', filter=Q(is_completed=True)),
+            avg_progress=Avg('progress_percentage')
+        ).order_by('-total')
+        
+        # Monthly comparison
+        this_month_start = end_date.replace(day=1)
+        last_month_end = this_month_start - timedelta(days=1)
+        last_month_start = last_month_end.replace(day=1)
+        
+        this_month_sessions = StudySession.objects.filter(
+            user=user,
+            date__gte=this_month_start
+        )
+        last_month_sessions = StudySession.objects.filter(
+            user=user,
+            date__gte=last_month_start,
+            date__lte=last_month_end
+        )
+        
+        this_month_hours = sum(s.duration_minutes for s in this_month_sessions) / 60.0
+        last_month_hours = sum(s.duration_minutes for s in last_month_sessions) / 60.0
+        
+        return JsonResponse({
+            'success': True,
+            'productivity_trends': productivity_by_day,
+            'subject_distribution': [{
+                'subject': item['subject'],
+                'subject_display': dict(StudySession.SUBJECT_CHOICES)[item['subject']],
+                'hours': round(item['total_minutes'] / 60.0, 1),
+                'sessions': item['session_count'],
+                'avg_productivity': round(item['avg_productivity'], 1),
+                'percentage': round((item['total_minutes'] / sum(s['total_minutes'] for s in subject_stats)) * 100, 1) if subject_stats else 0
+            } for item in subject_stats],
+            'goal_completion': [{
+                'category': item['category'],
+                'category_display': dict(Goal.CATEGORY_CHOICES)[item['category']],
+                'total': item['total'],
+                'completed': item['completed'],
+                'completion_rate': round((item['completed'] / item['total']) * 100, 1) if item['total'] > 0 else 0,
+                'avg_progress': round(item['avg_progress'], 1)
+            } for item in goal_stats],
+            'monthly_comparison': {
+                'this_month': {
+                    'hours': round(this_month_hours, 1),
+                    'sessions': this_month_sessions.count(),
+                    'avg_productivity': round(this_month_sessions.aggregate(avg=Avg('productivity_rating'))['avg'] or 0, 1)
+                },
+                'last_month': {
+                    'hours': round(last_month_hours, 1),
+                    'sessions': last_month_sessions.count(),
+                    'avg_productivity': round(last_month_sessions.aggregate(avg=Avg('productivity_rating'))['avg'] or 0, 1)
+                },
+                'change': {
+                    'hours': round(this_month_hours - last_month_hours, 1),
+                    'sessions': this_month_sessions.count() - last_month_sessions.count()
+                }
+            }
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+@require_POST
+def set_weekly_goal(request):
+    """Set or update weekly goals"""
+    try:
+        data = json.loads(request.body)
+        target_hours = float(data.get('target_hours', 10))
+        target_sessions = int(data.get('target_sessions', 5))
+        
+        today = timezone.now().date()
+        week_start = today - timedelta(days=today.weekday())
+        
+        weekly_goal, created = WeeklyGoal.objects.update_or_create(
+            user=request.user,
+            week_start=week_start,
+            defaults={
+                'target_study_hours': target_hours,
+                'target_sessions': target_sessions
+            }
+        )
+        
+        return JsonResponse({
+            'success': True,
+            'message': 'Weekly goals updated successfully!'
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+def delete_goal(request, goal_id):
+    """Delete a goal"""
+    try:
+        goal = get_object_or_404(Goal, id=goal_id, user=request.user)
+        goal.delete()
+        
+        return JsonResponse({
+            'success': True,
+            'message': 'Goal deleted successfully!'
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+def get_goal_detail(request, goal_id):
+    """Get detailed goal information with milestones"""
+    try:
+        goal = get_object_or_404(Goal, id=goal_id, user=request.user)
+        milestones = goal.milestones.all()
+        
+        goal_data = {
+            'id': goal.id,
+            'title': goal.title,
+            'description': goal.description,
+            'category': goal.category,
+            'priority': goal.priority,
+            'status': goal.status,
+            'progress_percentage': goal.progress_percentage,
+            'target_date': goal.target_date.isoformat() if goal.target_date else None,
+            'is_completed': goal.is_completed,
+            'is_overdue': goal.is_overdue(),
+            'days_remaining': goal.days_remaining(),
+            'created_at': goal.created_at.isoformat(),
+            'milestones': [{
+                'id': milestone.id,
+                'title': milestone.title,
+                'description': milestone.description,
+                'is_completed': milestone.is_completed,
+                'due_date': milestone.due_date.isoformat() if milestone.due_date else None,
+                'completed_at': milestone.completed_at.isoformat() if milestone.completed_at else None,
+            } for milestone in milestones]
+        }
+        
+        return JsonResponse({
+            'success': True,
+            'goal': goal_data
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+@require_POST
+def create_milestone(request, goal_id):
+    """Create a milestone for a goal"""
+    try:
+        goal = get_object_or_404(Goal, id=goal_id, user=request.user)
+        form = MilestoneForm(request.POST)
+        
+        if form.is_valid():
+            milestone = form.save(commit=False)
+            milestone.goal = goal
+            milestone.save()
+            
+            return JsonResponse({
+                'success': True,
+                'message': 'Milestone created successfully!',
+                'milestone_id': milestone.id
+            })
+        
+        return JsonResponse({
+            'success': False,
+            'errors': form.errors
+        }, status=400)
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+@require_POST
+def toggle_milestone(request, milestone_id):
+    """Toggle milestone completion status"""
+    try:
+        milestone = get_object_or_404(Milestone, id=milestone_id, goal__user=request.user)
+        
+        milestone.is_completed = not milestone.is_completed
+        if milestone.is_completed:
+            milestone.completed_at = timezone.now()
+        else:
+            milestone.completed_at = None
+        milestone.save()
+        
+        return JsonResponse({
+            'success': True,
+            'is_completed': milestone.is_completed,
+            'message': f'Milestone {"completed" if milestone.is_completed else "reopened"}!'
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
+
+@login_required
+def get_recent_activity(request):
+    """Get recent user activity for the activity feed"""
+    try:
+        user = request.user
+        activities = []
+        
+        # Recent study sessions
+        recent_sessions = StudySession.objects.filter(user=user).order_by('-created_at')[:5]
+        for session in recent_sessions:
+            activities.append({
+                'type': 'study_session',
+                'title': f'Studied {session.get_subject_display()}',
+                'description': f'{session.title} for {session.duration_minutes} minutes',
+                'timestamp': session.created_at.isoformat(),
+                'icon': '📚'
+            })
+        
+        # Recent goal updates
+        recent_goals = Goal.objects.filter(user=user, updated_at__gte=timezone.now() - timedelta(days=7)).order_by('-updated_at')[:5]
+        for goal in recent_goals:
+            if goal.is_completed:
+                activities.append({
+                    'type': 'goal_completed',
+                    'title': f'Completed Goal: {goal.title}',
+                    'description': f'Successfully achieved your {goal.get_category_display().lower()} goal',
+                    'timestamp': goal.updated_at.isoformat(),
+                    'icon': '🎯'
+                })
+        
+        # Recent achievements
+        recent_achievements = Achievement.objects.filter(user=user).order_by('-earned_at')[:5]
+        for achievement in recent_achievements:
+            activities.append({
+                'type': 'achievement',
+                'title': f'Achievement Unlocked: {achievement.title}',
+                'description': achievement.description,
+                'timestamp': achievement.earned_at.isoformat(),
+                'icon': achievement.icon,
+                'points': achievement.points
+            })
+        
+        # Sort all activities by timestamp
+        activities.sort(key=lambda x: x['timestamp'], reverse=True)
+        
+        return JsonResponse({
+            'success': True,
+            'activities': activities[:10]  # Return top 10 most recent
+        })
+        
+    except Exception as e:
+        return JsonResponse({'success': False, 'error': str(e)})
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
deleted file mode 100644
index c7cbb93e..00000000
Binary files a/db.sqlite3 and /dev/null differ
diff --git a/peerprep/urls.py b/peerprep/urls.py
index 0e6583ce..3f0fa3f4 100644
--- a/peerprep/urls.py
+++ b/peerprep/urls.py
@@ -43,10 +43,22 @@
     path('api/upvote-answer/<int:answer_id>/', views.upvote_answer, name='api_upvote_answer'),
     path('api/accept-answer/<int:answer_id>/', views.accept_answer, name='api_accept_answer'),
 
-     path('faq/', views.faq_view, name='faq'),
-     path('faq/add/', views.add_faq, name='add_faq'),
-     path('faq/delete/<int:faq_id>/', views.delete_faq, name='delete_faq')
-
+    path('faq/', views.faq_view, name='faq'),
+    path('faq/add/', views.add_faq, name='add_faq'),
+    path('faq/delete/<int:faq_id>/', views.delete_faq, name='delete_faq'),
+    
+    path('progress/', views.progress_tracking, name='progress_tracking'),
+    path('api/progress-dashboard/', views.get_progress_dashboard_data, name='api_progress_dashboard'),
+    path('api/goals/', views.get_goals, name='api_goals'),
+    path('api/create-goal/', views.create_goal, name='api_create_goal'),
+    path('api/goal/<int:goal_id>/', views.get_goal_detail, name='api_goal_detail'),
+    path('api/update-goal-progress/<int:goal_id>/', views.update_goal_progress, name='api_update_goal_progress'),
+    path('api/delete-goal/<int:goal_id>/', views.delete_goal, name='api_delete_goal'),
+    path('api/log-study-session/', views.log_study_session, name='api_log_study_session'),
+    path('api/set-weekly-goals/', views.set_weekly_goal, name='api_set_weekly_goals'),
+    path('api/create-milestone/<int:goal_id>/', views.create_milestone, name='api_create_milestone'),
+    path('api/toggle-milestone/<int:milestone_id>/', views.toggle_milestone, name='api_toggle_milestone'),
+    path('api/recent-activity/', views.get_recent_activity, name='api_recent_activity'),
 
 ]