diff --git a/code/tim/Django/lab05_drf_movie/qwikster/Pipfile b/code/tim/Django/lab05_drf_movie/qwikster/Pipfile
new file mode 100644
index 0000000..913d560
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/Pipfile
@@ -0,0 +1,14 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+django = "*"
+djangorestframework = "*"
+pillow = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.10"
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/Pipfile.lock b/code/tim/Django/lab05_drf_movie/qwikster/Pipfile.lock
new file mode 100644
index 0000000..58a7153
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/Pipfile.lock
@@ -0,0 +1,135 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "db587c3c50334c443e891c0b1baa413ab1b9be43767cceaa547619babab8e9dd"
+        },
+        "pipfile-spec": 6,
+        "requires": {
+            "python_version": "3.10"
+        },
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "asgiref": {
+            "hashes": [
+                "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4",
+                "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==3.5.2"
+        },
+        "django": {
+            "hashes": [
+                "sha256:678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1",
+                "sha256:6b1de6886cae14c7c44d188f580f8ba8da05750f544c80ae5ad43375ab293cd5"
+            ],
+            "index": "pypi",
+            "version": "==4.1.3"
+        },
+        "djangorestframework": {
+            "hashes": [
+                "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8",
+                "sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08"
+            ],
+            "index": "pypi",
+            "version": "==3.14.0"
+        },
+        "pillow": {
+            "hashes": [
+                "sha256:03150abd92771742d4a8cd6f2fa6246d847dcd2e332a18d0c15cc75bf6703040",
+                "sha256:073adb2ae23431d3b9bcbcff3fe698b62ed47211d0716b067385538a1b0f28b8",
+                "sha256:0b07fffc13f474264c336298d1b4ce01d9c5a011415b79d4ee5527bb69ae6f65",
+                "sha256:0b7257127d646ff8676ec8a15520013a698d1fdc48bc2a79ba4e53df792526f2",
+                "sha256:12ce4932caf2ddf3e41d17fc9c02d67126935a44b86df6a206cf0d7161548627",
+                "sha256:15c42fb9dea42465dfd902fb0ecf584b8848ceb28b41ee2b58f866411be33f07",
+                "sha256:18498994b29e1cf86d505edcb7edbe814d133d2232d256db8c7a8ceb34d18cef",
+                "sha256:1c7c8ae3864846fc95f4611c78129301e203aaa2af813b703c55d10cc1628535",
+                "sha256:22b012ea2d065fd163ca096f4e37e47cd8b59cf4b0fd47bfca6abb93df70b34c",
+                "sha256:276a5ca930c913f714e372b2591a22c4bd3b81a418c0f6635ba832daec1cbcfc",
+                "sha256:2e0918e03aa0c72ea56edbb00d4d664294815aa11291a11504a377ea018330d3",
+                "sha256:3033fbe1feb1b59394615a1cafaee85e49d01b51d54de0cbf6aa8e64182518a1",
+                "sha256:3168434d303babf495d4ba58fc22d6604f6e2afb97adc6a423e917dab828939c",
+                "sha256:32a44128c4bdca7f31de5be641187367fe2a450ad83b833ef78910397db491aa",
+                "sha256:3dd6caf940756101205dffc5367babf288a30043d35f80936f9bfb37f8355b32",
+                "sha256:40e1ce476a7804b0fb74bcfa80b0a2206ea6a882938eaba917f7a0f004b42502",
+                "sha256:41e0051336807468be450d52b8edd12ac60bebaa97fe10c8b660f116e50b30e4",
+                "sha256:4390e9ce199fc1951fcfa65795f239a8a4944117b5935a9317fb320e7767b40f",
+                "sha256:502526a2cbfa431d9fc2a079bdd9061a2397b842bb6bc4239bb176da00993812",
+                "sha256:51e0e543a33ed92db9f5ef69a0356e0b1a7a6b6a71b80df99f1d181ae5875636",
+                "sha256:57751894f6618fd4308ed8e0c36c333e2f5469744c34729a27532b3db106ee20",
+                "sha256:5d77adcd56a42d00cc1be30843d3426aa4e660cab4a61021dc84467123f7a00c",
+                "sha256:655a83b0058ba47c7c52e4e2df5ecf484c1b0b0349805896dd350cbc416bdd91",
+                "sha256:68943d632f1f9e3dce98908e873b3a090f6cba1cbb1b892a9e8d97c938871fbe",
+                "sha256:6c738585d7a9961d8c2821a1eb3dcb978d14e238be3d70f0a706f7fa9316946b",
+                "sha256:73bd195e43f3fadecfc50c682f5055ec32ee2c933243cafbfdec69ab1aa87cad",
+                "sha256:772a91fc0e03eaf922c63badeca75e91baa80fe2f5f87bdaed4280662aad25c9",
+                "sha256:77ec3e7be99629898c9a6d24a09de089fa5356ee408cdffffe62d67bb75fdd72",
+                "sha256:7db8b751ad307d7cf238f02101e8e36a128a6cb199326e867d1398067381bff4",
+                "sha256:801ec82e4188e935c7f5e22e006d01611d6b41661bba9fe45b60e7ac1a8f84de",
+                "sha256:82409ffe29d70fd733ff3c1025a602abb3e67405d41b9403b00b01debc4c9a29",
+                "sha256:828989c45c245518065a110434246c44a56a8b2b2f6347d1409c787e6e4651ee",
+                "sha256:829f97c8e258593b9daa80638aee3789b7df9da5cf1336035016d76f03b8860c",
+                "sha256:871b72c3643e516db4ecf20efe735deb27fe30ca17800e661d769faab45a18d7",
+                "sha256:89dca0ce00a2b49024df6325925555d406b14aa3efc2f752dbb5940c52c56b11",
+                "sha256:90fb88843d3902fe7c9586d439d1e8c05258f41da473952aa8b328d8b907498c",
+                "sha256:97aabc5c50312afa5e0a2b07c17d4ac5e865b250986f8afe2b02d772567a380c",
+                "sha256:9aaa107275d8527e9d6e7670b64aabaaa36e5b6bd71a1015ddd21da0d4e06448",
+                "sha256:9f47eabcd2ded7698106b05c2c338672d16a6f2a485e74481f524e2a23c2794b",
+                "sha256:a0a06a052c5f37b4ed81c613a455a81f9a3a69429b4fd7bb913c3fa98abefc20",
+                "sha256:ab388aaa3f6ce52ac1cb8e122c4bd46657c15905904b3120a6248b5b8b0bc228",
+                "sha256:ad58d27a5b0262c0c19b47d54c5802db9b34d38bbf886665b626aff83c74bacd",
+                "sha256:ae5331c23ce118c53b172fa64a4c037eb83c9165aba3a7ba9ddd3ec9fa64a699",
+                "sha256:af0372acb5d3598f36ec0914deed2a63f6bcdb7b606da04dc19a88d31bf0c05b",
+                "sha256:afa4107d1b306cdf8953edde0534562607fe8811b6c4d9a486298ad31de733b2",
+                "sha256:b03ae6f1a1878233ac620c98f3459f79fd77c7e3c2b20d460284e1fb370557d4",
+                "sha256:b0915e734b33a474d76c28e07292f196cdf2a590a0d25bcc06e64e545f2d146c",
+                "sha256:b4012d06c846dc2b80651b120e2cdd787b013deb39c09f407727ba90015c684f",
+                "sha256:b472b5ea442148d1c3e2209f20f1e0bb0eb556538690fa70b5e1f79fa0ba8dc2",
+                "sha256:b59430236b8e58840a0dfb4099a0e8717ffb779c952426a69ae435ca1f57210c",
+                "sha256:b90f7616ea170e92820775ed47e136208e04c967271c9ef615b6fbd08d9af0e3",
+                "sha256:b9a65733d103311331875c1dca05cb4606997fd33d6acfed695b1232ba1df193",
+                "sha256:bac18ab8d2d1e6b4ce25e3424f709aceef668347db8637c2296bcf41acb7cf48",
+                "sha256:bca31dd6014cb8b0b2db1e46081b0ca7d936f856da3b39744aef499db5d84d02",
+                "sha256:be55f8457cd1eac957af0c3f5ece7bc3f033f89b114ef30f710882717670b2a8",
+                "sha256:c7025dce65566eb6e89f56c9509d4f628fddcedb131d9465cacd3d8bac337e7e",
+                "sha256:c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f",
+                "sha256:dbb8e7f2abee51cef77673be97760abff1674ed32847ce04b4af90f610144c7b",
+                "sha256:e6ea6b856a74d560d9326c0f5895ef8050126acfdc7ca08ad703eb0081e82b74",
+                "sha256:ebf2029c1f464c59b8bdbe5143c79fa2045a581ac53679733d3a91d400ff9efb",
+                "sha256:f1ff2ee69f10f13a9596480335f406dd1f70c3650349e2be67ca3139280cade0"
+            ],
+            "index": "pypi",
+            "version": "==9.3.0"
+        },
+        "pytz": {
+            "hashes": [
+                "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427",
+                "sha256:e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2"
+            ],
+            "version": "==2022.6"
+        },
+        "sqlparse": {
+            "hashes": [
+                "sha256:0323c0ec29cd52bceabc1b4d9d579e311f3e4961b98d174201d5622a23b85e34",
+                "sha256:69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==0.4.3"
+        },
+        "tzdata": {
+            "hashes": [
+                "sha256:04a680bdc5b15750c39c12a448885a51134a27ec9af83667663f0b3a1bf3f342",
+                "sha256:91f11db4503385928c15598c98573e3af07e7229181bee5375bd30f1695ddcae"
+            ],
+            "markers": "sys_platform == 'win32'",
+            "version": "==2022.6"
+        }
+    },
+    "develop": {}
+}
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/admin.py b/code/tim/Django/lab05_drf_movie/qwikster/api/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/apps.py b/code/tim/Django/lab05_drf_movie/qwikster/api/apps.py
new file mode 100644
index 0000000..66656fd
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ApiConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'api'
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/migrations/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/api/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/models.py b/code/tim/Django/lab05_drf_movie/qwikster/api/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/permissions.py b/code/tim/Django/lab05_drf_movie/qwikster/api/permissions.py
new file mode 100644
index 0000000..21a11a1
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/permissions.py
@@ -0,0 +1,11 @@
+from rest_framework import permissions
+
+class ReadOnly(permissions.BasePermission):
+    def has_permission(self, request, view):
+        return request.method in permissions.SAFE_METHODS
+
+class IsAuthorOrReadOnly(permissions.BasePermission):
+    def has_object_permission(self, request, view, obj):
+        if request.method in permissions.SAFE_METHODS:
+            return True
+        return obj.author == request.user
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/serializers.py b/code/tim/Django/lab05_drf_movie/qwikster/api/serializers.py
new file mode 100644
index 0000000..d015f1a
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/serializers.py
@@ -0,0 +1,25 @@
+from rest_framework import serializers
+from movies.models import Movie
+from users.models import CustomUser
+
+class NestedMovieSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Movie
+        fields = ('id', 'title', 'genre', 'year', 'metacritic', 'addedBy', 'onNetflix', 'onHulu', 'onAmazon', 'onHBO')
+
+class NestedUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = CustomUser
+        fields = ('id', 'username')
+
+class MovieSerializer(serializers.ModelSerializer):
+    addedBy_detail = NestedUserSerializer(read_only=True, source='addedBy')
+    class Meta:
+        model = Movie
+        fields = ('id', 'title', 'genre', 'year', 'metacritic', 'addedBy', 'addedBy_detail', 'onNetflix', 'onHulu', 'onAmazon', 'onHBO')
+
+class UserSerializer(serializers.ModelSerializer):
+    movie_detail = NestedMovieSerializer(many=True, source='movies', read_only=True)
+    class Meta:
+        model = CustomUser
+        fields = ('id', 'username', 'movies', 'movie_detail')
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/tests.py b/code/tim/Django/lab05_drf_movie/qwikster/api/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/urls.py b/code/tim/Django/lab05_drf_movie/qwikster/api/urls.py
new file mode 100644
index 0000000..4518e4a
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+from rest_framework.routers import DefaultRouter
+from . import views
+
+router = DefaultRouter()
+router.register('movies', views.PostMovieSet, basename='movie')
+
+urlpatterns = router.urls + [
+]
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/api/views.py b/code/tim/Django/lab05_drf_movie/qwikster/api/views.py
new file mode 100644
index 0000000..ad4a685
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/api/views.py
@@ -0,0 +1,12 @@
+from movies.models import Movie
+from .serializers import MovieSerializer
+from rest_framework import generics, viewsets, permissions
+# from rest_framework.parsers import MultiPartParser, FormParser
+
+class MovieAPIView(generics.ListAPIView):
+    queryset = Movie.objects.all()
+    serializer_class = MovieSerializer
+
+class PostMovieSet(viewsets.ModelViewSet):
+    queryset = Movie.objects.all()
+    serializer_class = MovieSerializer
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/manage.py b/code/tim/Django/lab05_drf_movie/qwikster/manage.py
new file mode 100644
index 0000000..87b4616
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/manage.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    """Run administrative tasks."""
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'qwikster.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/media/uploads/The_Royal_Tenenbaums_poster.jpg b/code/tim/Django/lab05_drf_movie/qwikster/media/uploads/The_Royal_Tenenbaums_poster.jpg
new file mode 100644
index 0000000..4518034
Binary files /dev/null and b/code/tim/Django/lab05_drf_movie/qwikster/media/uploads/The_Royal_Tenenbaums_poster.jpg differ
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/media/uploads/jpposter.jpg b/code/tim/Django/lab05_drf_movie/qwikster/media/uploads/jpposter.jpg
new file mode 100644
index 0000000..910e546
Binary files /dev/null and b/code/tim/Django/lab05_drf_movie/qwikster/media/uploads/jpposter.jpg differ
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/admin.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/admin.py
new file mode 100644
index 0000000..43876c3
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/admin.py
@@ -0,0 +1,4 @@
+from django.contrib import admin
+from .models import Movie
+
+admin.site.register(Movie)
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/apps.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/apps.py
new file mode 100644
index 0000000..0a30ddd
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MoviesConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'movies'
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0001_initial.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0001_initial.py
new file mode 100644
index 0000000..5dfc37e
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0001_initial.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.1.3 on 2022-11-24 00:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Movie',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('genre', models.CharField(max_length=200)),
+                ('year', models.CharField(max_length=4)),
+                ('metacritic', models.CharField(max_length=200)),
+                ('onNetflix', models.BooleanField()),
+                ('onHulu', models.BooleanField()),
+                ('onAmazon', models.BooleanField()),
+                ('onHBO', models.BooleanField()),
+            ],
+        ),
+    ]
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0002_initial.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0002_initial.py
new file mode 100644
index 0000000..ca22289
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0002_initial.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.1.3 on 2022-11-24 00:31
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('movies', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='movie',
+            name='addedBy',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movies', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0003_alter_movie_onnetflix.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0003_alter_movie_onnetflix.py
new file mode 100644
index 0000000..8e60257
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0003_alter_movie_onnetflix.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2022-11-24 01:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('movies', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='movie',
+            name='onNetflix',
+            field=models.BooleanField(blank=True),
+        ),
+    ]
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0004_alter_movie_onnetflix.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0004_alter_movie_onnetflix.py
new file mode 100644
index 0000000..d031847
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0004_alter_movie_onnetflix.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2022-11-24 01:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('movies', '0003_alter_movie_onnetflix'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='movie',
+            name='onNetflix',
+            field=models.BooleanField(null=True),
+        ),
+    ]
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0005_alter_movie_onamazon_alter_movie_onhbo_and_more.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0005_alter_movie_onamazon_alter_movie_onhbo_and_more.py
new file mode 100644
index 0000000..d167c52
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/0005_alter_movie_onamazon_alter_movie_onhbo_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.1.3 on 2022-11-24 01:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('movies', '0004_alter_movie_onnetflix'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='movie',
+            name='onAmazon',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='movie',
+            name='onHBO',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='movie',
+            name='onHulu',
+            field=models.BooleanField(null=True),
+        ),
+    ]
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/models.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/models.py
new file mode 100644
index 0000000..e875ce7
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/models.py
@@ -0,0 +1,19 @@
+from django.db import models
+from users.models import CustomUser
+
+class Movie(models.Model):
+    title = models.CharField(max_length=200)
+    genre = models.CharField(max_length=200)
+    year = models.CharField(max_length=4)
+    metacritic = models.CharField(max_length=200)
+    addedBy = models.ForeignKey(CustomUser, related_name="movies", on_delete=models.CASCADE)
+    onNetflix = models.BooleanField(null=True)
+    onHulu = models.BooleanField(null=True)
+    onAmazon = models.BooleanField(null=True)
+    onHBO = models.BooleanField(null=True)
+
+    def __str__(self):
+        return self.title
+    
+    
+    # cover = models.ImageField(upload_to ='uploads/', blank=True, null=True)
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/tests.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/movies/views.py b/code/tim/Django/lab05_drf_movie/qwikster/movies/views.py
new file mode 100644
index 0000000..3e1ac18
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/movies/views.py
@@ -0,0 +1,6 @@
+from django.views.generic import ListView
+from .models import Movie
+
+class MovieListView(ListView):
+    model = Movie
+    template_name = 'home.html'
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/qwikster/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/qwikster/asgi.py b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/asgi.py
new file mode 100644
index 0000000..4875b3e
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/asgi.py
@@ -0,0 +1,16 @@
+"""
+ASGI config for qwikster project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'qwikster.settings')
+
+application = get_asgi_application()
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/qwikster/settings.py b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/settings.py
new file mode 100644
index 0000000..e1a453a
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/settings.py
@@ -0,0 +1,127 @@
+from pathlib import Path
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-2roa_03y753zyf7+cw6*(eul0-bze2atjj2)_s&04$3ze)y3hc'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+
+    'rest_framework',
+    'movies.apps.MoviesConfig',
+    'api.apps.ApiConfig',
+    'users.apps.UsersConfig',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'qwikster.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [BASE_DIR / 'templates'],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'qwikster.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/4.1/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/4.1/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'America/Los_Angeles'
+
+USE_I18N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/4.1/howto/static-files/
+
+STATIC_URL = '/static/'
+STATICFILES_DIRS = [BASE_DIR / 'static']
+
+MEDIA_URL = "/media/"
+MEDIA_ROOT = BASE_DIR / "media"
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+AUTH_USER_MODEL = 'users.CustomUser'
+
+LOGIN_REDIRECT_URL = 'home'
+LOGOUT_REDIRECT_URL = 'home'
+
+LOGIN_URL = 'login'
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/qwikster/urls.py b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/urls.py
new file mode 100644
index 0000000..74975d4
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/urls.py
@@ -0,0 +1,21 @@
+"""******** PROJECT ******** URL Configuration"""
+
+from django.urls import path, include
+from django.contrib import admin
+from django.conf import settings
+from django.conf.urls.static import static
+from django.views.generic import TemplateView
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('api/v1/', include('api.urls')),
+    path('users/', include('django.contrib.auth.urls')),
+    path('users/', include('users.urls')),
+    path('', TemplateView.as_view(template_name='home.html'), name='home'),
+]
+
+# + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    
+    
+    
+    # path('', include('movies.urls')),
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/qwikster/wsgi.py b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/wsgi.py
new file mode 100644
index 0000000..91b6315
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/qwikster/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for qwikster project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.1/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'qwikster.settings')
+
+application = get_wsgi_application()
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/static/app.js b/code/tim/Django/lab05_drf_movie/qwikster/static/app.js
new file mode 100644
index 0000000..bc71e9b
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/static/app.js
@@ -0,0 +1,81 @@
+const app = Vue.createApp({
+    delimiters: ['[[', ']]'],
+    data(){
+        return{
+            currentUser: {},
+            csrfToken: '',
+            movies: [],
+            newMovie: {
+                "title" : "",
+                "genre": "",
+                "year": "",
+                'rating': "",
+                'addedBy': "",
+                'onNetflix': "",
+                'onHulu': "",
+                'onAmazon': "",
+                'onHBO': "",
+            }
+        }
+    },
+    methods: {
+        loadMovies(){
+            axios({
+                method: 'get',
+                url: '../../api/v1/movies'
+            }).then(response => {
+                this.movies = response.data
+                // console.log(response.data)
+                }
+            )
+        },
+
+        createMovie() {
+            axios({
+                method: 'post',
+                url: '../../api/v1/movies/',
+                headers: {
+                    'X-CSRFToken': this.csrfToken
+                },
+                data: {
+                    "title" : this.newMovie.title,
+                    "genre": this.newMovie.genre,
+                    "year": this.newMovie.year,
+                    "metacritic": this.newMovie.metacritic,
+                    "addedBy": this.currentUser.id,
+                    "onNetflix": this.newMovie.onNetflix,
+                    "onHulu": this.newMovie.onHulu,
+                    "onAmazon": this.newMovie.onAmazon,
+                    "onHBO": this.newMovie.onHBO,
+                }
+            }).then(response => {
+                this.loadMovies()
+                console.log(response.data)
+            }
+            ).catch(error => {
+                console.log(error.response.data)
+            })
+        },
+        
+        loadCurrentUser(){
+            axios({
+                method: 'get',
+                url: '../../users/currentuser/'
+            }).then(response => {
+                // console.log('CU', response.data)
+                this.currentUser = response.data
+            })
+        }
+
+    },
+    
+    created: function() {
+        this.loadMovies()
+        this.loadCurrentUser()
+    
+    },
+    mounted(){
+        this.csrfToken = document.querySelector("input[name=csrfmiddlewaretoken]").value
+    }
+})
+
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/static/favicon.ico b/code/tim/Django/lab05_drf_movie/qwikster/static/favicon.ico
new file mode 100644
index 0000000..700eb7c
Binary files /dev/null and b/code/tim/Django/lab05_drf_movie/qwikster/static/favicon.ico differ
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/static/styles.css b/code/tim/Django/lab05_drf_movie/qwikster/static/styles.css
new file mode 100644
index 0000000..e432b56
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/static/styles.css
@@ -0,0 +1,39 @@
+*{
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body{
+    color: white;
+    background-color: rgb(53, 85, 111);
+}
+
+#nav {
+    display: flex;
+    justify-content: space-between;
+}
+
+#welcome_text {
+    width: 40rem;
+}
+
+#movie_gallery {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100vw;
+    gap: 1rem;
+}
+
+#movie_card {
+    display: flex;
+    flex-direction: column;
+    font-size: small;
+    justify-content: space-between;
+    text-align: center;
+    padding-block: 0.2rem;
+    width: 10rem;
+    height: 15rem;
+    border-radius: 5px;
+    background-color: #200000;
+}
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/templates/base.html b/code/tim/Django/lab05_drf_movie/qwikster/templates/base.html
new file mode 100644
index 0000000..c05d73f
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/templates/base.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="en">
+    {% load static %}
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="{% static '/styles.css' %}">
+    <link rel="icon" type="image/x-icon" href="{% static '/favicon.ico' %}">
+    <title>FriendFlix</title>
+</head>
+<body>
+    
+    {% csrf_token %}
+    <div id="app">
+        <div id="nav">
+            <div id="welcome_text">
+                <p>Welcome to FriendFlix! Add movies that you own or are streaming and compare with friends to find something you can watch together remotely.  Once a match has been found and you are ready to start, the "Action!" button will begin a timer telling you when to press Play on the movie.</p><br>
+            </div>
+            <div id="login_logout">
+                {% if user.is_authenticated %}
+                    <a href="{% url 'users:profile' user.username %}">[[currentUser.username]]</a><br>
+                    <a href="{% url 'logout' %}">Logout</a>
+                {% else %}
+                    <a href="{% url 'users:signup' %}">Signup</a>
+                    <a href="{% url 'login' %}">Login</a>
+                {% endif %}
+            </div>
+        </div><br>
+        
+        {% block content %}
+        {% endblock content %}
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+    <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
+    <script src="{% static '/app.js' %}"></script> 
+    <script> const mountApp = app.mount('#app') </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/templates/home.html b/code/tim/Django/lab05_drf_movie/qwikster/templates/home.html
new file mode 100644
index 0000000..cda91db
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/templates/home.html
@@ -0,0 +1,31 @@
+{% extends 'base.html' %}
+{% block content %}
+
+<div id="movie_gallery">
+    <div id="movie_card" v-for="movie in movies">
+        <p>[[movie.title]] </p>
+        <p>[[movie.year]] [[movie.genre]]   [[movie.metacritic]]%</p>
+        
+    </div>
+</div><br>
+
+<div id="add_movie">
+    <input type='text' placeholder="Title" v-model="newMovie.title">
+    <input type='text' placeholder="Genre" v-model="newMovie.genre">
+    <input type='text' placeholder="Year" v-model="newMovie.year">
+    <input type='text' placeholder="Metacritic Rating" v-model="newMovie.metacritic"><br>
+    
+    <input type='checkbox' id="on_netflix" v-model="newMovie.onNetflix">
+    <label for="on_netflix">On Netflix</label>
+    <input type='checkbox' id="on_hulu" v-model="newMovie.onHulu">
+    <label for="on_hulu">On Hulu</label>
+    <input type='checkbox' id="on_amazon" v-model="newMovie.onAmazon">
+    <label for="on_amazon">On Amazon Prime</label>
+    <input type='checkbox' id="on_hbo" v-model="newMovie.onHBO">
+    <label for="on_hbo">On HBO</label><br>
+    
+    
+    <button @click="createMovie">Add Movie</button>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/templates/registration/login.html b/code/tim/Django/lab05_drf_movie/qwikster/templates/registration/login.html
new file mode 100644
index 0000000..797d9e4
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/templates/registration/login.html
@@ -0,0 +1,6 @@
+<h1>Login</h1>
+<form action="" method="post">
+  {% csrf_token %}
+  {{ form.as_p }}
+  <input type="submit" value="Login">
+</form>
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/templates/registration/signup.html b/code/tim/Django/lab05_drf_movie/qwikster/templates/registration/signup.html
new file mode 100644
index 0000000..e25eb6a
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/templates/registration/signup.html
@@ -0,0 +1,6 @@
+<h1>Sign up</h1>
+<form action="" method="post">
+  {% csrf_token %}
+  {{ form.as_p }}
+  <button type="submit">Sign Up</button>
+</form>
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/templates/user_profile.html b/code/tim/Django/lab05_drf_movie/qwikster/templates/user_profile.html
new file mode 100644
index 0000000..3a9913e
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/templates/user_profile.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% block content %}
+
+<p>Movies added by: [[currentUser.username]]<p><br>
+
+<div id="movie_gallery">
+    <div id="movie_card" v-for="movie in currentUser.movie_detail">
+        <p>[[movie.title]] </p>
+        <p>[[movie.year]] [[movie.genre]]   [[movie.metacritic]]%</p>
+    </div>
+</div><br>
+
+{% endblock content %}
+
+
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/users/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/admin.py b/code/tim/Django/lab05_drf_movie/qwikster/users/admin.py
new file mode 100644
index 0000000..f6f74f7
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/admin.py
@@ -0,0 +1,14 @@
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+
+from .forms import CustomUserCreationForm, CustomUserChangeForm
+from .models import CustomUser
+
+class CustomUserAdmin(UserAdmin):
+    add_form = CustomUserCreationForm
+    form = CustomUserChangeForm
+    model = CustomUser
+    list_display = ['username', 'first_name', 'last_name', 'email']
+
+admin.site.register(CustomUser, CustomUserAdmin)
+
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/apps.py b/code/tim/Django/lab05_drf_movie/qwikster/users/apps.py
new file mode 100644
index 0000000..72b1401
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class UsersConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'users'
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/forms.py b/code/tim/Django/lab05_drf_movie/qwikster/users/forms.py
new file mode 100644
index 0000000..e6c49bd
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/forms.py
@@ -0,0 +1,13 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from .models import CustomUser
+
+class CustomUserCreationForm(UserCreationForm):
+    class Meta:
+        model = CustomUser
+        fields = ('username', 'first_name', 'last_name', 'country', 'age', 'email')
+
+class CustomUserChangeForm(UserChangeForm):
+    class Meta:
+        model = CustomUser
+        fields = ('username', 'first_name', 'last_name', 'country', 'age', 'email')
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/migrations/0001_initial.py b/code/tim/Django/lab05_drf_movie/qwikster/users/migrations/0001_initial.py
new file mode 100644
index 0000000..d35ec57
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/migrations/0001_initial.py
@@ -0,0 +1,45 @@
+# Generated by Django 4.1.3 on 2022-11-24 00:31
+
+import django.contrib.auth.models
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CustomUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('username', models.CharField(max_length=50, unique=True)),
+                ('first_name', models.CharField(max_length=50)),
+                ('last_name', models.CharField(max_length=50)),
+                ('country', models.CharField(max_length=50)),
+                ('age', models.IntegerField(null=True)),
+                ('email', models.EmailField(max_length=254)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
+            },
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+    ]
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/migrations/__init__.py b/code/tim/Django/lab05_drf_movie/qwikster/users/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/models.py b/code/tim/Django/lab05_drf_movie/qwikster/users/models.py
new file mode 100644
index 0000000..9d5f1f1
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/models.py
@@ -0,0 +1,13 @@
+from django.db import models
+from django.contrib.auth.models import AbstractUser
+
+class CustomUser(AbstractUser):
+    username = models.CharField(max_length=50, unique=True)
+    first_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
+    country = models.CharField(max_length=50)
+    age = models.IntegerField(null=True)
+    email = models.EmailField(max_length=254)
+
+    def __str__(self):
+        return self.username
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/tests.py b/code/tim/Django/lab05_drf_movie/qwikster/users/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/urls.py b/code/tim/Django/lab05_drf_movie/qwikster/users/urls.py
new file mode 100644
index 0000000..16c57de
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/urls.py
@@ -0,0 +1,15 @@
+from django.urls import path
+from rest_framework.routers import DefaultRouter
+from . import views
+from .views import SignUpView, UserProfileView
+
+app_name = 'users'
+
+router = DefaultRouter()
+router.register('users', views.UserViewSet, basename='users')
+
+urlpatterns = [
+    path('signup/', SignUpView.as_view(), name='signup'),
+    path('currentuser/', views.CurrentUserView.as_view()),
+    path('<str:username>/', UserProfileView.as_view(), name='profile')
+]
\ No newline at end of file
diff --git a/code/tim/Django/lab05_drf_movie/qwikster/users/views.py b/code/tim/Django/lab05_drf_movie/qwikster/users/views.py
new file mode 100644
index 0000000..7f2e0ad
--- /dev/null
+++ b/code/tim/Django/lab05_drf_movie/qwikster/users/views.py
@@ -0,0 +1,33 @@
+from django.shortcuts import render, get_object_or_404
+from rest_framework import generics, viewsets
+from django.views.generic.edit import CreateView
+from django.views.generic import DetailView
+from django.contrib.auth.models import User
+from django.urls import reverse_lazy
+from users.models import CustomUser
+from api.serializers import UserSerializer
+from api.permissions import IsAuthorOrReadOnly
+from .forms import CustomUserCreationForm, CustomUserChangeForm
+
+class SignUpView(CreateView):
+    form_class = CustomUserCreationForm
+    template_name = 'registration/signup.html'
+    success_url = reverse_lazy('login')
+
+class CurrentUserView(generics.RetrieveUpdateAPIView):
+    serializer_class = UserSerializer
+    def get_object(self):
+        return self.request.user
+
+class UserViewSet(viewsets.ReadOnlyModelViewSet):
+    queryset = CustomUser
+    serializer_class = UserSerializer
+    permission_classes = [IsAuthorOrReadOnly]
+
+class UserProfileView(DetailView):
+    model = CustomUser
+    template_name = 'user_profile.html'
+    context_object_name = 'user_profile'
+    
+    def get_object(self):
+        return get_object_or_404(CustomUser, username=self.kwargs['username'])
\ No newline at end of file