diff --git a/Pipfile b/Pipfile
index faba7f7..b20f92b 100644
--- a/Pipfile
+++ b/Pipfile
@@ -16,7 +16,7 @@ pre-commit = "*"
 
 [packages]
 uwsgi = "*"
-django = "==2.2.10"
+django = "==3.2.9"
 cssselect = "==1.0.3"
 dateutils = "==0.6.6"
 markdown = "==3.0.1"
diff --git a/Pipfile.lock b/Pipfile.lock
index f5840c0..b2239e4 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "fd9540a5750aaceed7bc5f21c3cb88fc9e4127fa66471317d212500a540d050f"
+            "sha256": "c273f5961572a51a9cad5be3b2941495c985ca6b8a7cb0e0e151ea67741b997e"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -23,12 +23,20 @@
             ],
             "version": "==1.4.0"
         },
+        "asgiref": {
+            "hashes": [
+                "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9",
+                "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.1"
+        },
         "certifi": {
             "hashes": [
-                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
-                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
+                "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
+                "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
             ],
-            "version": "==2020.12.5"
+            "version": "==2021.10.8"
         },
         "chardet": {
             "hashes": [
@@ -62,11 +70,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:1226168be1b1c7efd0e66ee79b0e0b58b2caa7ed87717909cd8a57bb13a7079a",
-                "sha256:9a4635813e2d498a3c01b10c701fe4a515d76dd290aaa792ccb65ca4ccb6b038"
+                "sha256:51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08",
+                "sha256:e22c9266da3eec7827737cde57694d7db801fedac938d252bf27377cec06ed1b"
             ],
             "index": "pypi",
-            "version": "==2.2.10"
+            "version": "==3.2.9"
         },
         "django-dotenv": {
             "hashes": [
@@ -165,7 +173,7 @@
                 "sha256:ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277"
             ],
             "index": "pypi",
-            "version": "==2018.5"
+            "version": "===2018.5"
         },
         "requests": {
             "hashes": [
@@ -177,18 +185,27 @@
         },
         "simplejson": {
             "hashes": [
+                "sha256:c206f47cbf9f32b573c9885f0ec813d2622976cf5effcf7e472344bc2e020ac1",
                 "sha256:067a7177ddfa32e1483ba5169ebea1bc2ea27f224853211ca669325648ca5642",
-                "sha256:2fc546e6af49fb45b93bbe878dea4c48edc34083729c0abd09981fe55bdf7f91",
                 "sha256:354fa32b02885e6dae925f1b5bbf842c333c1e11ea5453ddd67309dc31fdb40a",
-                "sha256:37e685986cf6f8144607f90340cff72d36acf654f3653a6c47b84c5c38d00df7",
+                "sha256:491de7acc423e871a814500eb2dcea8aa66c4a4b1b4825d18f756cdf58e370cb",
+                "sha256:ee9625fc8ee164902dfbb0ff932b26df112da9f871c32f0f9c1bcf20c350fe2a",
+                "sha256:65b41a5cda006cfa7c66eabbcf96aa704a6be2a5856095b9e2fd8c293bad2b46",
+                "sha256:fb2530b53c28f0d4d84990e945c2ebb470edb469d63e389bf02ff409012fe7c5",
                 "sha256:3af610ee72efbe644e19d5eaad575c73fb83026192114e5f6719f4901097fce2",
                 "sha256:3b919fc9cf508f13b929a9b274c40786036b31ad28657819b3b9ba44ba651f50",
+                "sha256:2c139daf167b96f21542248f8e0a06596c9b9a7a41c162cc5c9ee9f3833c93cd",
+                "sha256:79b129fe65fdf3765440f7a73edaffc89ae9e7885d4e2adafe6aa37913a00fbb",
+                "sha256:75e3f0b12c28945c08f54350d91e624f8dd580ab74fd4f1bbea54bc6b0165610",
+                "sha256:feadb95170e45f439455354904768608e356c5b174ca30b3d11b0e3f24b5c0df",
+                "sha256:d8e238f20bcf70063ee8691d4a72162bcec1f4c38f83c93e6851e72ad545dabb",
+                "sha256:37e685986cf6f8144607f90340cff72d36acf654f3653a6c47b84c5c38d00df7",
+                "sha256:495511fe5f10ccf4e3ed4fc0c48318f533654db6c47ecbc970b4ed215c791968",
                 "sha256:3dd289368bbd064974d9a5961101f080e939cbe051e6689a193c99fb6e9ac89b",
                 "sha256:6c3258ffff58712818a233b9737fe4be943d306c40cf63d14ddc82ba563f483a",
-                "sha256:75e3f0b12c28945c08f54350d91e624f8dd580ab74fd4f1bbea54bc6b0165610",
                 "sha256:b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5",
-                "sha256:ee9625fc8ee164902dfbb0ff932b26df112da9f871c32f0f9c1bcf20c350fe2a",
-                "sha256:fb2530b53c28f0d4d84990e945c2ebb470edb469d63e389bf02ff409012fe7c5"
+                "sha256:2fc546e6af49fb45b93bbe878dea4c48edc34083729c0abd09981fe55bdf7f91",
+                "sha256:2b8cb601d9ba0381499db719ccc9dfbb2fbd16013f5ff096b1a68a4775576a04"
             ],
             "index": "pypi",
             "version": "==3.16.0"
@@ -214,115 +231,133 @@
                 "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4",
                 "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"
             ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' and python_version < '4'",
             "version": "==1.24.3"
         },
         "uwsgi": {
             "hashes": [
-                "sha256:faa85e053c0b1be4d5585b0858d3a511d2cd10201802e8676060fd0a109e5869"
+                "sha256:88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9"
             ],
             "index": "pypi",
-            "version": "==2.0.19.1"
+            "version": "==2.0.20"
         },
         "whitenoise": {
             "hashes": [
-                "sha256:05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7",
-                "sha256:05d00198c777028d72d8b0bbd234db605ef6d60e9410125124002518a48e515d"
+                "sha256:d234b871b52271ae7ed6d9da47ffe857c76568f11dd30e28e18c5869dbd11e12",
+                "sha256:d963ef25639d1417e8a247be36e6aedd8c7c6f0a08adcb5a89146980a96b577c"
             ],
             "index": "pypi",
-            "version": "==5.2.0"
+            "version": "==5.3.0"
         }
     },
     "develop": {
-        "appdirs": {
+        "asgiref": {
             "hashes": [
-                "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41",
-                "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"
+                "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9",
+                "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"
             ],
-            "version": "==1.4.4"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.1"
         },
-        "asgiref": {
+        "astroid": {
             "hashes": [
-                "sha256:5ee950735509d04eb673bd7f7120f8fa1c9e2df495394992c73234d526907e17",
-                "sha256:7162a3cb30ab0609f1a4c95938fd73e8604f63bdba516a7f7d64b83ff09478f0"
+                "sha256:5939cf55de24b92bda00345d4d0659d01b3c7dafb5055165c330bc7c568ba273",
+                "sha256:776ca0b748b4ad69c00bfe0fff38fa2d21c338e12c84aa9715ee0d473c422778"
             ],
-            "version": "==3.3.1"
+            "markers": "python_version ~= '3.6'",
+            "version": "==2.9.0"
         },
-        "astroid": {
+        "backports.entry-points-selectable": {
             "hashes": [
-                "sha256:2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703",
-                "sha256:bc58d83eb610252fd8de6363e39d4f1d0619c894b0ed24603b881c02e64c7386"
+                "sha256:7fceed9532a7aa2bd888654a7314f864a3c16a4e710b34a58cfc0f08114c663b",
+                "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"
             ],
-            "version": "==2.4.2"
+            "markers": "python_version >= '2.7'",
+            "version": "==1.1.1"
         },
         "cfgv": {
             "hashes": [
-                "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d",
-                "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"
+                "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426",
+                "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"
             ],
-            "version": "==3.2.0"
+            "markers": "python_full_version >= '3.6.1'",
+            "version": "==3.3.1"
         },
         "coverage": {
             "hashes": [
-                "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516",
-                "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259",
-                "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9",
-                "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097",
-                "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0",
-                "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f",
-                "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7",
-                "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c",
-                "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5",
-                "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7",
-                "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729",
-                "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978",
-                "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9",
-                "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f",
-                "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9",
-                "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822",
-                "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418",
-                "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82",
-                "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f",
-                "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d",
-                "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221",
-                "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4",
-                "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21",
-                "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709",
-                "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54",
-                "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d",
-                "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270",
-                "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24",
-                "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751",
-                "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a",
-                "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237",
-                "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7",
-                "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636",
-                "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"
+                "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0",
+                "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd",
+                "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884",
+                "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48",
+                "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76",
+                "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0",
+                "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64",
+                "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685",
+                "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47",
+                "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d",
+                "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840",
+                "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f",
+                "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971",
+                "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c",
+                "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a",
+                "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de",
+                "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17",
+                "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4",
+                "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521",
+                "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57",
+                "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b",
+                "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282",
+                "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644",
+                "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475",
+                "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d",
+                "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da",
+                "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953",
+                "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2",
+                "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e",
+                "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c",
+                "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc",
+                "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64",
+                "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74",
+                "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617",
+                "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3",
+                "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d",
+                "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa",
+                "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739",
+                "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8",
+                "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8",
+                "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781",
+                "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58",
+                "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9",
+                "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c",
+                "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd",
+                "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e",
+                "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"
             ],
             "index": "pypi",
-            "version": "==5.3"
+            "version": "==6.2"
         },
         "distlib": {
             "hashes": [
-                "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb",
-                "sha256:edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1"
+                "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31",
+                "sha256:d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"
             ],
-            "version": "==0.3.1"
+            "version": "==0.3.3"
         },
         "django": {
             "hashes": [
-                "sha256:1226168be1b1c7efd0e66ee79b0e0b58b2caa7ed87717909cd8a57bb13a7079a",
-                "sha256:9a4635813e2d498a3c01b10c701fe4a515d76dd290aaa792ccb65ca4ccb6b038"
+                "sha256:51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08",
+                "sha256:e22c9266da3eec7827737cde57694d7db801fedac938d252bf27377cec06ed1b"
             ],
             "index": "pypi",
-            "version": "==2.2.10"
+            "version": "==3.2.9"
         },
         "django-debug-toolbar": {
             "hashes": [
-                "sha256:84e2607d900dbd571df0a2acf380b47c088efb787dce9805aefeb407341961d2",
-                "sha256:9e5a25d0c965f7e686f6a8ba23613ca9ca30184daa26487706d4829f5cfb697a"
+                "sha256:8c5b13795d4040008ee69ba82dcdd259c49db346cf7d0de6e561a49d191f0860",
+                "sha256:d7bab7573fab35b0fd029163371b7182f5826c13da69734beb675c761d06a4d3"
             ],
             "index": "pypi",
-            "version": "==3.2"
+            "version": "==3.2.2"
         },
         "django-nose": {
             "hashes": [
@@ -342,81 +377,71 @@
         },
         "faker": {
             "hashes": [
-                "sha256:7bca5b074299ac6532be2f72979e6793f1a2403ca8105cb4cf0b385a964469c4",
-                "sha256:fb21a76064847561033d8cab1cfd11af436ddf2c6fe72eb51b3cda51dff86bdc"
+                "sha256:049185d17ff95c4311557da6b72416c18732e5977dcfd116a323b6d620db5dca",
+                "sha256:7227703a3db36ed8241108547544445f45aa45db2f3f63e885cb9b5699383f0e"
             ],
-            "version": "==5.0.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==9.9.0"
         },
         "filelock": {
             "hashes": [
-                "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59",
-                "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"
+                "sha256:2e139a228bcf56dd8b2274a65174d005c4a6b68540ee0bdbb92c76f43f29f7e8",
+                "sha256:93d512b32a23baf4cac44ffd72ccf70732aeff7b8050fcaf6d3ec406d954baf4"
             ],
-            "version": "==3.0.12"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.0"
         },
         "flake8": {
             "hashes": [
-                "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839",
-                "sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"
+                "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d",
+                "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"
             ],
             "index": "pypi",
-            "version": "==3.8.4"
+            "version": "==4.0.1"
         },
         "identify": {
             "hashes": [
-                "sha256:943cd299ac7f5715fcb3f684e2fc1594c1e0f22a90d15398e5888143bd4144b5",
-                "sha256:cc86e6a9a390879dcc2976cef169dd9cc48843ed70b7380f321d1b118163c60e"
+                "sha256:a33ae873287e81651c7800ca309dc1f84679b763c9c8b30680e16fbfa82f0107",
+                "sha256:eba31ca80258de6bb51453084bff4a923187cd2193b9c13710f2516ab30732cc"
             ],
-            "version": "==1.5.10"
-        },
-        "importlib-metadata": {
-            "hashes": [
-                "sha256:6112e21359ef8f344e7178aa5b72dc6e62b38b0d008e6d3cb212c5b84df72013",
-                "sha256:b0c2d3b226157ae4517d9625decf63591461c66b3a808c2666d538946519d170"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.1.1"
-        },
-        "importlib-resources": {
-            "hashes": [
-                "sha256:7b51f0106c8ec564b1bef3d9c588bc694ce2b92125bbb6278f4f2f5b54ec3592",
-                "sha256:a3d34a8464ce1d5d7c92b0ea4e921e696d86f2aa212e684451cb1482c8d84ed5"
-            ],
-            "markers": "python_version < '3.7'",
-            "version": "==3.3.0"
+            "markers": "python_full_version >= '3.6.1'",
+            "version": "==2.4.0"
         },
         "isort": {
             "hashes": [
-                "sha256:dcab1d98b469a12a1a624ead220584391648790275560e1a43e54c5dceae65e7",
-                "sha256:dcaeec1b5f0eca77faea2a35ab790b4f3680ff75590bfcb7145986905aab2f58"
+                "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7",
+                "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"
             ],
-            "version": "==5.6.4"
+            "markers": "python_version < '4.0' and python_full_version >= '3.6.1'",
+            "version": "==5.10.1"
         },
         "lazy-object-proxy": {
             "hashes": [
-                "sha256:0c4b206227a8097f05c4dbdd323c50edf81f15db3b8dc064d08c62d37e1a504d",
-                "sha256:194d092e6f246b906e8f70884e620e459fc54db3259e60cf69a4d66c3fda3449",
-                "sha256:1be7e4c9f96948003609aa6c974ae59830a6baecc5376c25c92d7d697e684c08",
-                "sha256:4677f594e474c91da97f489fea5b7daa17b5517190899cf213697e48d3902f5a",
-                "sha256:48dab84ebd4831077b150572aec802f303117c8cc5c871e182447281ebf3ac50",
-                "sha256:5541cada25cd173702dbd99f8e22434105456314462326f06dba3e180f203dfd",
-                "sha256:59f79fef100b09564bc2df42ea2d8d21a64fdcda64979c0fa3db7bdaabaf6239",
-                "sha256:8d859b89baf8ef7f8bc6b00aa20316483d67f0b1cbf422f5b4dc56701c8f2ffb",
-                "sha256:9254f4358b9b541e3441b007a0ea0764b9d056afdeafc1a5569eee1cc6c1b9ea",
-                "sha256:9651375199045a358eb6741df3e02a651e0330be090b3bc79f6d0de31a80ec3e",
-                "sha256:97bb5884f6f1cdce0099f86b907aa41c970c3c672ac8b9c8352789e103cf3156",
-                "sha256:9b15f3f4c0f35727d3a0fba4b770b3c4ebbb1fa907dbcc046a1d2799f3edd142",
-                "sha256:a2238e9d1bb71a56cd710611a1614d1194dc10a175c1e08d75e1a7bcc250d442",
-                "sha256:a6ae12d08c0bf9909ce12385803a543bfe99b95fe01e752536a60af2b7797c62",
-                "sha256:ca0a928a3ddbc5725be2dd1cf895ec0a254798915fb3a36af0964a0a4149e3db",
-                "sha256:cb2c7c57005a6804ab66f106ceb8482da55f5314b7fcb06551db1edae4ad1531",
-                "sha256:d74bb8693bf9cf75ac3b47a54d716bbb1a92648d5f781fc799347cfc95952383",
-                "sha256:d945239a5639b3ff35b70a88c5f2f491913eb94871780ebfabb2568bd58afc5a",
-                "sha256:eba7011090323c1dadf18b3b689845fd96a61ba0a1dfbd7f24b921398affc357",
-                "sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4",
-                "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"
-            ],
-            "version": "==1.4.3"
+                "sha256:17e0967ba374fc24141738c69736da90e94419338fd4c7c7bef01ee26b339653",
+                "sha256:1fee665d2638491f4d6e55bd483e15ef21f6c8c2095f235fef72601021e64f61",
+                "sha256:22ddd618cefe54305df49e4c069fa65715be4ad0e78e8d252a33debf00f6ede2",
+                "sha256:24a5045889cc2729033b3e604d496c2b6f588c754f7a62027ad4437a7ecc4837",
+                "sha256:410283732af311b51b837894fa2f24f2c0039aa7f220135192b38fcc42bd43d3",
+                "sha256:4732c765372bd78a2d6b2150a6e99d00a78ec963375f236979c0626b97ed8e43",
+                "sha256:489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726",
+                "sha256:4f60460e9f1eb632584c9685bccea152f4ac2130e299784dbaf9fae9f49891b3",
+                "sha256:5743a5ab42ae40caa8421b320ebf3a998f89c85cdc8376d6b2e00bd12bd1b587",
+                "sha256:85fb7608121fd5621cc4377a8961d0b32ccf84a7285b4f1d21988b2eae2868e8",
+                "sha256:9698110e36e2df951c7c36b6729e96429c9c32b3331989ef19976592c5f3c77a",
+                "sha256:9d397bf41caad3f489e10774667310d73cb9c4258e9aed94b9ec734b34b495fd",
+                "sha256:b579f8acbf2bdd9ea200b1d5dea36abd93cabf56cf626ab9c744a432e15c815f",
+                "sha256:b865b01a2e7f96db0c5d12cfea590f98d8c5ba64ad222300d93ce6ff9138bcad",
+                "sha256:bf34e368e8dd976423396555078def5cfc3039ebc6fc06d1ae2c5a65eebbcde4",
+                "sha256:c6938967f8528b3668622a9ed3b31d145fab161a32f5891ea7b84f6b790be05b",
+                "sha256:d1c2676e3d840852a2de7c7d5d76407c772927addff8d742b9808fe0afccebdf",
+                "sha256:d7124f52f3bd259f510651450e18e0fd081ed82f3c08541dffc7b94b883aa981",
+                "sha256:d900d949b707778696fdf01036f58c9876a0d8bfe116e8d220cfd4b15f14e741",
+                "sha256:ebfd274dcd5133e0afae738e6d9da4323c3eb021b3e13052d8cbd0e457b1256e",
+                "sha256:ed361bb83436f117f9917d282a456f9e5009ea12fd6de8742d1a4752c3017e93",
+                "sha256:f5144c75445ae3ca2057faac03fda5a902eff196702b0a24daf1d6ce0650514b"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==1.6.0"
         },
         "mccabe": {
             "hashes": [
@@ -427,18 +452,18 @@
         },
         "mock": {
             "hashes": [
-                "sha256:3f9b2c0196c60d21838f307f5825a7b86b678cedc58ab9e50a8988187b4d81e0",
-                "sha256:dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72"
+                "sha256:122fcb64ee37cfad5b3f48d7a7d51875d7031aaf3d8be7c42e2bee25044eee62",
+                "sha256:7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc"
             ],
             "index": "pypi",
-            "version": "==4.0.2"
+            "version": "==4.0.3"
         },
         "nodeenv": {
             "hashes": [
-                "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9",
-                "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"
+                "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b",
+                "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"
             ],
-            "version": "==1.5.0"
+            "version": "==1.6.0"
         },
         "nose": {
             "hashes": [
@@ -456,35 +481,45 @@
             "index": "pypi",
             "version": "==1.7.1"
         },
+        "platformdirs": {
+            "hashes": [
+                "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2",
+                "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==2.4.0"
+        },
         "pre-commit": {
             "hashes": [
-                "sha256:949b13efb7467ae27e2c8f9e83434dacf2682595124d8902554a4e18351e5781",
-                "sha256:e31c04bc23741194a7c0b983fe512801e151a0638c6001c49f2bd034f8a664a1"
+                "sha256:758d1dc9b62c2ed8881585c254976d66eae0889919ab9b859064fc2fe3c7743e",
+                "sha256:fe9897cac830aa7164dbd02a4e7b90cae49630451ce88464bca73db486ba9f65"
             ],
             "index": "pypi",
-            "version": "==2.9.2"
+            "version": "==2.16.0"
         },
         "pycodestyle": {
             "hashes": [
-                "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367",
-                "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"
+                "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20",
+                "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"
             ],
-            "version": "==2.6.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==2.8.0"
         },
         "pyflakes": {
             "hashes": [
-                "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92",
-                "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"
+                "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c",
+                "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"
             ],
-            "version": "==2.2.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.4.0"
         },
         "pylint": {
             "hashes": [
-                "sha256:bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210",
-                "sha256:bfe68f020f8a0fece830a22dd4d5dddb4ecc6137db04face4c3420a46a52239f"
+                "sha256:4f4a52b132c05b49094b28e109febcec6bfb7bc6961c7485a5ad0a0f961df289",
+                "sha256:b4b5a7b6d04e914a11c198c816042af1fb2d3cda29bb0c98a9c637010da2a5c5"
             ],
             "index": "pypi",
-            "version": "==2.6.0"
+            "version": "==2.12.1"
         },
         "python-dateutil": {
             "hashes": [
@@ -500,25 +535,46 @@
                 "sha256:ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277"
             ],
             "index": "pypi",
-            "version": "==2018.5"
+            "version": "===2018.5"
         },
         "pyyaml": {
             "hashes": [
-                "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97",
-                "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76",
-                "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2",
-                "sha256:6034f55dab5fea9e53f436aa68fa3ace2634918e8b5994d82f3621c04ff5ed2e",
-                "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648",
-                "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf",
-                "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f",
-                "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2",
-                "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee",
-                "sha256:ad9c67312c84def58f3c04504727ca879cb0013b2517c85a9a253f0cb6380c0a",
-                "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d",
-                "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c",
-                "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"
-            ],
-            "version": "==5.3.1"
+                "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
+                "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
+                "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
+                "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b",
+                "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4",
+                "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07",
+                "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba",
+                "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9",
+                "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
+                "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
+                "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
+                "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
+                "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
+                "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
+                "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
+                "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
+                "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
+                "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
+                "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
+                "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
+                "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
+                "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
+                "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
+                "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
+                "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
+                "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
+                "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
+                "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
+                "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
+                "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
+                "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
+                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
+                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==6.0"
         },
         "six": {
             "hashes": [
@@ -548,64 +604,81 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.10.2"
         },
-        "typed-ast": {
-            "hashes": [
-                "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355",
-                "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919",
-                "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d",
-                "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa",
-                "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652",
-                "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75",
-                "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c",
-                "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01",
-                "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d",
-                "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1",
-                "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907",
-                "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c",
-                "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3",
-                "sha256:7e4c9d7658aaa1fc80018593abdf8598bf91325af6af5cce4ce7c73bc45ea53d",
-                "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b",
-                "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614",
-                "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c",
-                "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb",
-                "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395",
-                "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b",
-                "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41",
-                "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6",
-                "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34",
-                "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe",
-                "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072",
-                "sha256:f208eb7aff048f6bea9586e61af041ddf7f9ade7caed625742af423f6bae3298",
-                "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91",
-                "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4",
-                "sha256:fcf135e17cc74dbfbc05894ebca928ffeb23d9790b3167a674921db19082401f",
-                "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"
-            ],
-            "markers": "implementation_name == 'cpython' and python_version < '3.8'",
-            "version": "==1.4.1"
-        },
-        "virtualenv": {
+        "typing-extensions": {
             "hashes": [
-                "sha256:07cff122e9d343140366055f31be4dcd61fd598c69d11cd33a9d9c8df4546dd7",
-                "sha256:e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5"
+                "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e",
+                "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"
             ],
-            "version": "==20.2.1"
+            "markers": "python_version < '3.10'",
+            "version": "==4.0.1"
         },
-        "wrapt": {
+        "virtualenv": {
             "hashes": [
-                "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"
+                "sha256:4b02e52a624336eece99c96e3ab7111f469c24ba226a53ec474e8e787b365814",
+                "sha256:576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"
             ],
-            "version": "==1.12.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.10.0"
         },
-        "zipp": {
+        "wrapt": {
             "hashes": [
-                "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108",
-                "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"
-            ],
-            "markers": "python_version < '3.8'",
-            "version": "==3.4.0"
+                "sha256:086218a72ec7d986a3eddb7707c8c4526d677c7b35e355875a0fe2918b059179",
+                "sha256:0877fe981fd76b183711d767500e6b3111378ed2043c145e21816ee589d91096",
+                "sha256:0a017a667d1f7411816e4bf214646d0ad5b1da2c1ea13dec6c162736ff25a374",
+                "sha256:0cb23d36ed03bf46b894cfec777eec754146d68429c30431c99ef28482b5c1df",
+                "sha256:1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185",
+                "sha256:220a869982ea9023e163ba915077816ca439489de6d2c09089b219f4e11b6785",
+                "sha256:25b1b1d5df495d82be1c9d2fad408f7ce5ca8a38085e2da41bb63c914baadff7",
+                "sha256:2dded5496e8f1592ec27079b28b6ad2a1ef0b9296d270f77b8e4a3a796cf6909",
+                "sha256:2ebdde19cd3c8cdf8df3fc165bc7827334bc4e353465048b36f7deeae8ee0918",
+                "sha256:43e69ffe47e3609a6aec0fe723001c60c65305784d964f5007d5b4fb1bc6bf33",
+                "sha256:46f7f3af321a573fc0c3586612db4decb7eb37172af1bc6173d81f5b66c2e068",
+                "sha256:47f0a183743e7f71f29e4e21574ad3fa95676136f45b91afcf83f6a050914829",
+                "sha256:498e6217523111d07cd67e87a791f5e9ee769f9241fcf8a379696e25806965af",
+                "sha256:4b9c458732450ec42578b5642ac53e312092acf8c0bfce140ada5ca1ac556f79",
+                "sha256:51799ca950cfee9396a87f4a1240622ac38973b6df5ef7a41e7f0b98797099ce",
+                "sha256:5601f44a0f38fed36cc07db004f0eedeaadbdcec90e4e90509480e7e6060a5bc",
+                "sha256:5f223101f21cfd41deec8ce3889dc59f88a59b409db028c469c9b20cfeefbe36",
+                "sha256:610f5f83dd1e0ad40254c306f4764fcdc846641f120c3cf424ff57a19d5f7ade",
+                "sha256:6a03d9917aee887690aa3f1747ce634e610f6db6f6b332b35c2dd89412912bca",
+                "sha256:705e2af1f7be4707e49ced9153f8d72131090e52be9278b5dbb1498c749a1e32",
+                "sha256:766b32c762e07e26f50d8a3468e3b4228b3736c805018e4b0ec8cc01ecd88125",
+                "sha256:77416e6b17926d953b5c666a3cb718d5945df63ecf922af0ee576206d7033b5e",
+                "sha256:778fd096ee96890c10ce96187c76b3e99b2da44e08c9e24d5652f356873f6709",
+                "sha256:78dea98c81915bbf510eb6a3c9c24915e4660302937b9ae05a0947164248020f",
+                "sha256:7dd215e4e8514004c8d810a73e342c536547038fb130205ec4bba9f5de35d45b",
+                "sha256:7dde79d007cd6dfa65afe404766057c2409316135cb892be4b1c768e3f3a11cb",
+                "sha256:81bd7c90d28a4b2e1df135bfbd7c23aee3050078ca6441bead44c42483f9ebfb",
+                "sha256:85148f4225287b6a0665eef08a178c15097366d46b210574a658c1ff5b377489",
+                "sha256:865c0b50003616f05858b22174c40ffc27a38e67359fa1495605f96125f76640",
+                "sha256:87883690cae293541e08ba2da22cacaae0a092e0ed56bbba8d018cc486fbafbb",
+                "sha256:8aab36778fa9bba1a8f06a4919556f9f8c7b33102bd71b3ab307bb3fecb21851",
+                "sha256:8c73c1a2ec7c98d7eaded149f6d225a692caa1bd7b2401a14125446e9e90410d",
+                "sha256:936503cb0a6ed28dbfa87e8fcd0a56458822144e9d11a49ccee6d9a8adb2ac44",
+                "sha256:944b180f61f5e36c0634d3202ba8509b986b5fbaf57db3e94df11abee244ba13",
+                "sha256:96b81ae75591a795d8c90edc0bfaab44d3d41ffc1aae4d994c5aa21d9b8e19a2",
+                "sha256:981da26722bebb9247a0601e2922cedf8bb7a600e89c852d063313102de6f2cb",
+                "sha256:ae9de71eb60940e58207f8e71fe113c639da42adb02fb2bcbcaccc1ccecd092b",
+                "sha256:b73d4b78807bd299b38e4598b8e7bd34ed55d480160d2e7fdaabd9931afa65f9",
+                "sha256:d4a5f6146cfa5c7ba0134249665acd322a70d1ea61732723c7d3e8cc0fa80755",
+                "sha256:dd91006848eb55af2159375134d724032a2d1d13bcc6f81cd8d3ed9f2b8e846c",
+                "sha256:e05e60ff3b2b0342153be4d1b597bbcfd8330890056b9619f4ad6b8d5c96a81a",
+                "sha256:e6906d6f48437dfd80464f7d7af1740eadc572b9f7a4301e7dd3d65db285cacf",
+                "sha256:e92d0d4fa68ea0c02d39f1e2f9cb5bc4b4a71e8c442207433d8db47ee79d7aa3",
+                "sha256:e94b7d9deaa4cc7bac9198a58a7240aaf87fe56c6277ee25fa5b3aa1edebd229",
+                "sha256:ea3e746e29d4000cd98d572f3ee2a6050a4f784bb536f4ac1f035987fc1ed83e",
+                "sha256:ec7e20258ecc5174029a0f391e1b948bf2906cd64c198a9b8b281b811cbc04de",
+                "sha256:ec9465dd69d5657b5d2fa6133b3e1e989ae27d29471a672416fd729b429eb554",
+                "sha256:f122ccd12fdc69628786d0c947bdd9cb2733be8f800d88b5a37c57f1f1d73c10",
+                "sha256:f99c0489258086308aad4ae57da9e8ecf9e1f3f30fa35d5e170b4d4896554d80",
+                "sha256:f9c51d9af9abb899bd34ace878fbec8bf357b3194a10c4e8e0a25512826ef056",
+                "sha256:fd76c47f20984b43d93de9a82011bb6e5f8325df6c9ed4d8310029a55fa361ea"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==1.13.3"
         }
     }
 }
diff --git a/README.rst b/README.rst
index cb201db..8bb1543 100644
--- a/README.rst
+++ b/README.rst
@@ -25,8 +25,8 @@ First clone the repository from BitBucket and switch to the new directory::
 
 Next, create a virtual environment and install all of the requirements::
 
-  (iticket)$ pip shell
-  (iticket)$ pipenv install --dev
+  (gingerhouse)$ pip shell
+  (gingerhouse)$ pipenv install --dev
 
 Now, create a local settings file and set your DJANGO_SETTINGS_MODULE to use it:::
 
diff --git a/gingerhouse/houses/admin.py b/gingerhouse/houses/admin.py
index 96cd190..433314c 100644
--- a/gingerhouse/houses/admin.py
+++ b/gingerhouse/houses/admin.py
@@ -2,15 +2,22 @@
 
 
 from gingerhouse.houses.models import Category, GingerHouse, Vote
+from gingerhouse.photos.models import Photo
 
 
 class CategoryAdmin(admin.ModelAdmin):
     list_display = ("name",)
 
 
+class PhotoAdminInline(admin.TabularInline):
+    model = Photo
+    extra = 3
+
+
 class GingerHouseAdmin(admin.ModelAdmin):
     list_display = ("name", "vote_count")
-    
+    inlines = [PhotoAdminInline]
+
     def vote_count(self, obj):
         return obj.vote_set.all().count()
 
diff --git a/gingerhouse/houses/forms.py b/gingerhouse/houses/forms.py
index 734e1de..77387fe 100644
--- a/gingerhouse/houses/forms.py
+++ b/gingerhouse/houses/forms.py
@@ -14,9 +14,9 @@ def __init__(self, *args, **kwargs):
 
     def clean(self):
         cleaned_data = self.cleaned_data
-        # is there a vote with this email to same house category?
+        # is there a vote with this email on this entry already?
         email = cleaned_data.get("email")
-        already_voted = Vote.objects.filter(email=email, ginger_house__category=self.ginger_house.category).exists()
+        already_voted = Vote.objects.filter(email=email, ginger_house=self.ginger_house).exists()
         if already_voted:
-            raise forms.ValidationError("You have already voted in this category")
+            raise forms.ValidationError("You have already voted for this entry")
         return cleaned_data
diff --git a/gingerhouse/houses/migrations/0003_remove_image_field.py b/gingerhouse/houses/migrations/0003_remove_image_field.py
new file mode 100644
index 0000000..659ef6b
--- /dev/null
+++ b/gingerhouse/houses/migrations/0003_remove_image_field.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.9 on 2021-12-01 23:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('houses', '0002_auto_20201205_1227'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='category',
+            options={'verbose_name_plural': 'Categories'},
+        ),
+        migrations.AlterModelOptions(
+            name='gingerhouse',
+            options={'ordering': ['-category__name']},
+        ),
+        migrations.RemoveField(
+            model_name='gingerhouse',
+            name='image',
+        ),
+    ]
diff --git a/gingerhouse/houses/models.py b/gingerhouse/houses/models.py
index 287c285..e80aae3 100644
--- a/gingerhouse/houses/models.py
+++ b/gingerhouse/houses/models.py
@@ -5,7 +5,7 @@
 class Category(models.Model):
     """Categories are used to limit voting and present entries in groupings"""
     name = models.CharField(max_length=255)
-    
+
     class Meta:
         verbose_name_plural = "Categories"
 
@@ -21,21 +21,18 @@ class GingerHouse(models.Model):
     category = models.ForeignKey('Category', on_delete=models.CASCADE)
     display_address = models.TextField(blank=True)
     model_address = models.TextField(blank=True)
-    image = models.ImageField(
-        verbose_name="Ginger house image",
-        upload_to='uploads/',
-        max_length=255,
-        blank=True,
-        null=True,
-        help_text="Ginger house image. Horizontal format, cropped to 812x680 px.",
-    )
-    
+
     class Meta:
         ordering = ["-category__name", ]
 
     def __str__(self):
         return self.name
-        
+
+    @property
+    def primary_image(self):
+        image = self.photo_set.filter(is_primary=True).first()
+        return image
+
     def get_absolute_url(self):
         return reverse("houses:detail", kwargs={"pk": self.id})
 
@@ -46,4 +43,3 @@ class Vote(models.Model):
 
     def __str__(self):
         return "{} - {} - {}".format(self.email, self.ginger_house.category.name, self.ginger_house.name)
-
diff --git a/gingerhouse/houses/views.py b/gingerhouse/houses/views.py
index 7539d38..524f3ef 100644
--- a/gingerhouse/houses/views.py
+++ b/gingerhouse/houses/views.py
@@ -1,20 +1,32 @@
+from random import shuffle
+
+from django.db.models import OuterRef, Subquery, ImageField
 from django.shortcuts import redirect, reverse
 from django.views.generic import ListView, DetailView, FormView
 
 from gingerhouse.houses.forms import VoteForm
 from gingerhouse.houses.models import GingerHouse, Vote
+from gingerhouse.photos.models import Photo
 
 
 class HousesListView(ListView):
     model = GingerHouse
     template_name = 'houses/index.html'
 
+    def get_queryset(self):
+        qs = super().get_queryset().order_by('name')
+        qs = qs.annotate(
+            image=Subquery(Photo.objects.filter(house=OuterRef("id"), is_primary=True)[:1].values("image"),
+                           output_field=ImageField())
+        )
+        return qs
+
 
 class HouseDetailView(DetailView):
     model = GingerHouse
     template_name = 'houses/detail.html'
     context_object_name = "house"
-    
+
     def get_context_data(self, **kwargs):
         ctx = super(HouseDetailView, self).get_context_data(**kwargs)
         ctx["form"] = VoteForm(ginger_house=ctx["object"])
@@ -24,7 +36,7 @@ def get_context_data(self, **kwargs):
 class VoteView(FormView):
     template_name = 'houses/detail.html'
     form_class = VoteForm
-    
+
     def get_ginger_house(self):
         ginger_house_id = self.kwargs.get("ginger_house_id")
         ginger_house = GingerHouse.objects.get(pk=ginger_house_id)
diff --git a/gingerhouse/photos/__init__.py b/gingerhouse/photos/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gingerhouse/photos/migrations/0001_initial.py b/gingerhouse/photos/migrations/0001_initial.py
new file mode 100644
index 0000000..6a75c4b
--- /dev/null
+++ b/gingerhouse/photos/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.9 on 2021-12-01 23:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('houses', '0003_remove_image_field'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Image',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image', models.ImageField(blank=True, help_text='Ginger house image. Horizontal format, cropped to 812x680 px.', max_length=255, null=True, upload_to='uploads/', verbose_name='Ginger house image')),
+                ('is_primary', models.BooleanField(default=False)),
+                ('description', models.TextField(blank=True)),
+                ('house', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='houses.gingerhouse')),
+            ],
+        ),
+    ]
diff --git a/gingerhouse/photos/migrations/0002_rename_image_photo.py b/gingerhouse/photos/migrations/0002_rename_image_photo.py
new file mode 100644
index 0000000..97bbe4a
--- /dev/null
+++ b/gingerhouse/photos/migrations/0002_rename_image_photo.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2021-12-01 23:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('houses', '0003_remove_image_field'),
+        ('photos', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Image',
+            new_name='Photo',
+        ),
+    ]
diff --git a/gingerhouse/photos/migrations/__init__.py b/gingerhouse/photos/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gingerhouse/photos/models.py b/gingerhouse/photos/models.py
new file mode 100644
index 0000000..439129a
--- /dev/null
+++ b/gingerhouse/photos/models.py
@@ -0,0 +1,21 @@
+from django.db import models
+
+
+class Photo(models.Model):
+    house = models.ForeignKey("houses.GingerHouse", null=True, blank=False, on_delete=models.SET_NULL)
+    image = models.ImageField(
+        verbose_name="Ginger house image",
+        upload_to='uploads/',
+        max_length=255,
+        blank=True,
+        null=True,
+        help_text="Ginger house image. Horizontal format, cropped to 812x680 px.",
+    )
+    is_primary = models.BooleanField(default=False)
+    description = models.TextField(blank=True)
+
+    class Meta:
+        ordering = ("house__id", "is_primary")
+
+    def __str__(self):
+        return self.description
diff --git a/gingerhouse/settings/base.py b/gingerhouse/settings/base.py
index 5011023..221be20 100644
--- a/gingerhouse/settings/base.py
+++ b/gingerhouse/settings/base.py
@@ -22,7 +22,6 @@
 )
 
 # Application definition
-
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -33,7 +32,8 @@
     'django.contrib.humanize',
     'django.contrib.sitemaps',
     # local apps
-    'gingerhouse.houses'
+    'gingerhouse.houses',
+    'gingerhouse.photos',
 ]
 
 MIDDLEWARE = [
@@ -205,3 +205,5 @@
 SECURE_BROWSER_XSS_FILTER = True
 CSRF_COOKIE_HTTPONLY = True
 X_FRAME_OPTIONS = 'DENY'
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/gingerhouse/settings/deploy.py b/gingerhouse/settings/deploy.py
index ffcae6f..5c0e736 100644
--- a/gingerhouse/settings/deploy.py
+++ b/gingerhouse/settings/deploy.py
@@ -68,12 +68,12 @@
 
 MEDIA_ROOT = '/storage/media/'
 
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '%(CACHE_HOST)s' % os.environ,
-    }
-}
+# CACHES = {
+#     'default': {
+#         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+#         'LOCATION': '%(CACHE_HOST)s' % os.environ,
+#     }
+# }
 
 EMAIL_HOST = os.environ.get('EMAIL_HOST', 'localhost')
 EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER', '')
@@ -99,9 +99,7 @@
 
 SESSION_COOKIE_HTTPONLY = True
 
-ALLOWED_HOSTS = ['gingerhouse.tworock.io', 'homesfortheholidays-2020.com',
-                'www.homesfortheholidays-2020.com', 'homesfortheholidays2020.com',
-                'www.homesfortheholidays2020.com', ]
+ALLOWED_HOSTS = ['gingerhouse.tworock.io', 'homesfortheholidays2021.com', 'www.homesfortheholidays2021.com', ]
 
 # Use template caching on deployed servers
 for backend in TEMPLATES:
diff --git a/gingerhouse/static/css/index.css b/gingerhouse/static/css/index.css
index e704d35..ca54e84 100644
--- a/gingerhouse/static/css/index.css
+++ b/gingerhouse/static/css/index.css
@@ -20,7 +20,6 @@
     --small-border-radius: .5rem;
 }
 
-
 body {
   background-color: var(--tan);
   color: var(--brown);
@@ -331,4 +330,4 @@ i.fa-map-marker-alt::after {
   -webkit-box-shadow: 3px 3px 5px 6px #ccc;  /* Safari 3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
   -moz-box-shadow:    3px 3px 5px 6px #ccc;  /* Firefox 3.5 - 3.6 */
   box-shadow:         3px 3px 5px 6px #ccc;  /* Opera 10.5, IE 9, Firefox 4+, Chrome 6+, iOS 5 */
-}
\ No newline at end of file
+}
diff --git a/gingerhouse/static/img/HHFTH_FB-Banner.jpg b/gingerhouse/static/img/HHFTH_FB-Banner.jpg
new file mode 100644
index 0000000..d843d9d
Binary files /dev/null and b/gingerhouse/static/img/HHFTH_FB-Banner.jpg differ
diff --git a/gingerhouse/templates/base.html b/gingerhouse/templates/base.html
index 588a6db..06b9161 100644
--- a/gingerhouse/templates/base.html
+++ b/gingerhouse/templates/base.html
@@ -1,13 +1,13 @@
-{% load static from staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html lang="en" class="no-js">
 <head>
     <meta charset="utf-8">
-    <title>{% block title %}{% endblock %}Homes For The Holidays - 2020 - Historic Hillsborugh Gingerbread House Competition</title>
+    <title>{% block title %}{% endblock %}Homes For The Holidays - 2021 - Historic Hillsborugh Gingerbread House Competition</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{% block meta-description %}{% endblock %}Vote for your favorite gingerbread recreations of Historic Hillsborough structures!">
-    <meta property="og:image" content="{% static 'img/HFTH_Social_Banner.jpg' %}">
-    <meta name="twitter:image" content="{% static 'img/HFTH_Social_Banner.jpg' %}">
+    <meta name="description" content="{% block meta-description %}{% endblock %}Vote for your favorite gingerbread recreations of iconic structures on display in Hillsborough, NC!">
+    <meta property="og:image" content="{% static 'img/HHFTH_FB-Banner.jpg' %}">
+    <meta name="twitter:image" content="{% static 'img/HHFTH_FB-Banner.jpg' %}">
     <meta name="author" content="{% block meta-author %}{% endblock %}">
     <meta name="keywords" content="{% block meta-keywords %}{% endblock %}">
     {% block extra-meta %}{% endblock %}
diff --git a/gingerhouse/templates/houses/detail.html b/gingerhouse/templates/houses/detail.html
index a82164a..28e6590 100644
--- a/gingerhouse/templates/houses/detail.html
+++ b/gingerhouse/templates/houses/detail.html
@@ -5,6 +5,13 @@
 
 {% block body_class %}detail{% endblock %}
 
+{% block extra-css %}
+<!-- Required Core Stylesheet -->
+<link rel="stylesheet" href="https://unpkg.com/@glidejs/glide@3.5.2/dist/css/glide.core.min.css">
+
+<!-- Optional Theme Stylesheet -->
+<link rel="stylesheet" href="https://unpkg.com/@glidejs/glide@3.5.2/dist/css/glide.theme.min.css">
+{% endblock %}
 
 {% block content %}
 
@@ -12,71 +19,112 @@
 
     <div class="padding-bottom-10rem">
         <div class="row">
-        <div class="house col-md-8" id="house-{{ house.id }}">
-            <div class="card-header">
-                <div class="header-text">
-                    <h2 class="name">{{ house.name }}</h2>
-                    <h3 class="model_address">{{ house.model_address }}</h3> 
+            <div class="house col-md-8" id="house-{{ house.id }}">
+                <div class="card-header">
+                    <div class="header-text">
+                        <h2 class="name">{{ house.name }}</h2>
+                        <h3 class="model_address">{{ house.model_address }}</h3>
+                    </div>
+                </div>
+                <div class="card-footer">
+                    <p class="location text-center">
+                        <span class="green">Located At:</span><br>
+                        <span class="display_address">
+                             <a href="https://www.google.com/maps/d/u/0/viewer?mid=1rzkgK5HgPTe00XUVYzhauv8Jp3882ADy&ll=36.07568285226868%2C-79.09972604999999&z=19">
+                            {{ house.display_address }}
+                            </a>
+                        </span>
+                    </p>
                 </div>
             </div>
-            <div class="card-body">
-                <img class="card-img-top image" alt="{{ house.name }} image"
-                    src="{% if house.image %}{{ house.image.url }}{% else %}/static/img/placeholder-house.jpg{% endif %}"
-                />
-            </div>
-            <div class="card-footer">
-                <p class="location text-center">
-                    <span class="green">Located At:</span><br>
-                    <span class="display_address">
-                         <a href="https://www.google.com/maps/d/u/0/viewer?mid=1rzkgK5HgPTe00XUVYzhauv8Jp3882ADy&ll=36.07568285226868%2C-79.09972604999999&z=19">
-                        {{ house.display_address }}
-                        </a>
-                    </span>
-                </p>                    
+
+            <div class="col-md-4 vertical-align">
+                <form action="{% url 'houses:vote' ginger_house_id=house.id %}" method="POST">
+                    {% csrf_token %}
+
+                    {% if form.non_field_errors %}
+                      <div class="non-field-errors errors">
+                        {% for err in form.non_field_errors %}
+                          <p class="form-error">{{ err }}</p>
+                        {% endfor %}
+                      </div>
+                    {% endif %}
+
+                    {% for field in form %}
+                        {% if field.errors %}
+                            <div class="form-group error controls center-block">
+                                <div class="">{{ field }}</div>
+                            </div>
+                            <div class="errors">
+                                <p class="help-inline">
+                                    <span>{% for error in  field.errors %}{{ error }}{% endfor %}</span>
+                                </p>
+                            </div>
+                        {% else %}
+                            <div class="form-group controls center-block">
+                                <div class="controls">{{ field }}</div>
+                            </div>
+                            <div class="">
+                                {% if field.help_text %}
+                                    <p class="help-inline"><span>{{ field.help_text }}</span></p>
+                                {% endif %}
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+
+                    <div class="form-group text-center">
+                        <button class="btn background-green"><h3 class="white">Vote</h3></button>
+                    </div>
+                </form>
             </div>
         </div>
-        
-        <div class="col-md-4 vertical-align">
-            <form action="{% url 'houses:vote' ginger_house_id=house.id %}" method="POST">
-                {% csrf_token %}
-
-                {% if form.non_field_errors %}
-                  <div class="non-field-errors errors">
-                    {% for err in form.non_field_errors %}
-                      <p class="form-error">{{ err }}</p>
+
+        <div class="row pt-5">
+            <div class="glide">
+              <div class="glide__track" data-glide-el="track">
+                <ul class="glide__slides">
+                    {% for photo in house.photo_set.all %}
+                      <li class="glide__slide">
+                        <img class="card-img-top image" alt="{{ house.name }} image"
+                            src="{{ photo.image.url }}"
+                        />
+                      </li>
                     {% endfor %}
+                </ul>
+              </div>
+
+              {% if house.photo_set.all.count > 1 %}
+                  <div class="glide__arrows d-none d-md-block" data-glide-el="controls">
+                    <button class="glide__arrow glide__arrow--left" data-glide-dir="<"><i class="fa fa-arrow-left" aria-hidden="true"></i></button>
+                    <button class="glide__arrow glide__arrow--right" data-glide-dir=">"><i class="fa fa-arrow-right" aria-hidden="true"></i></button>
                   </div>
-                {% endif %}
-
-                {% for field in form %}
-                    {% if field.errors %}
-                        <div class="form-group error controls center-block">
-                            <div class="">{{ field }}</div>
-                        </div>
-                        <div class="errors">
-                            <p class="help-inline">
-                                <span>{% for error in  field.errors %}{{ error }}{% endfor %}</span>
-                            </span>
-                        </div>
-                    {% else %}
-                        <div class="form-group controls center-block">
-                            <div class="controls">{{ field }}</div>
-                        </div>
-                        <div class="">
-                            {% if field.help_text %}
-                                <p class="help-inline"><span>{{ field.help_text }}</span></p>
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                {% endfor %}
-                
-                <div class="form-group text-center">
-                    <button class="btn background-green"><h3 class="white">Vote</h3></button>
-                </div>
-            </form>
-        </div>
+              {% endif %}
+            </div>
         </div>
     </div>
     
     {% include "includes/email-required-text.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block extra-js %}
+    <script type="text/javascript" src="https://unpkg.com/@glidejs/glide@3.5.2/dist/glide.min.js"></script>
+    <script type="text/javascript">
+        new Glide('.glide', {
+          type: 'carousel',
+          startAt: 0,
+          perView: 1,
+          autoplay: 5000,
+          peek: { before: 250, after: 250 },
+
+          breakpoints: {
+              1200: {
+                  type: 'carousel',
+                  startAt: 0,
+                  perView: 1,
+                  autoplay: 3000,
+                  peek: {before: 33, after: 33},
+              }
+          }
+        }).mount()
+    </script>
+{% endblock %}
diff --git a/gingerhouse/templates/houses/index.html b/gingerhouse/templates/houses/index.html
index be292ab..fb81158 100644
--- a/gingerhouse/templates/houses/index.html
+++ b/gingerhouse/templates/houses/index.html
@@ -5,8 +5,16 @@
 {% block content %}
     
     <div class="contianer-fluid text-center col-md-6 home-container home-text">
-        <h2>Voting is open until</h2>
-        <h2>December 30</h2>
+        <h1>Not Your Mother’s Gingerbread Competition.</h1>
+        <p>Part art project, part opportunity to clean the cupboards, our contest only has one rule:
+            Anything VISIBLE must be EDIBLE.</p>
+
+        <p>This Year’s Theme:
+            FAVORITE STRUCTURE FROM AROUND THE WORLD
+            Come see 30 confectionery creations on display in Hillsborough’s downtown windows now through January 2.</p>
+
+        <p>EVERYONE is encouraged to VOTE on the PEOPLE’S CHOICE AWARD</p>
+        <h2>VOTING IS OPEN NOW THROUGH 11:59pm on DECEMBER 21</h2>
     </div>
    
         <div class="container-fluid text-center col-md-6 home-container home-text row">
@@ -22,7 +30,7 @@ <h3>Creation Locations</h3>
     <div class="card donate-card col-md-10 shadow">
         <div class="row">
             <div class="col-md-8">
-              <h3>In Benefit of <span class="peach">community giving fund's emergency housing assistance</span> for orange county, NC</h1>            
+              <h3>In Benefit of <span class="peach">Hillsborough Arts Council and Orange Congregations in Mission</span> for Orange County, NC</h1>
             </div>
             <div class="col-md-4 vertical-align">
                 {% include 'includes/donate-button.html' %}
@@ -36,12 +44,12 @@ <h3>In Benefit of <span class="peach">community giving fund's emergency housing
         <div class="row">
             <div class="col-md-6">
                 <div class="ginger-bread vertical-align">
-                    <h3 class="white">Tap Gingerbread house to vote</h3>
+                    <h3 class="white">Tap Gingerbread house to see more and vote</h3>
                 </div>
             </div>
             <div class="col-md-6 vertical-align vote">
                 <h1 class="peach">
-                    You may vote once in each category
+                    Vote for as many entries as you like, one vote per entry. 
                 </h1>
             </div>
         </div>
@@ -62,7 +70,7 @@ <h3 class="model_address">{{ house.model_address }}</h3>
                     </div>
                     <div class="card-body">
                         <a href="{{ house.get_absolute_url }}"><img class="card-img-top image" alt="{{ house.name }} image"
-                            src="{% if house.image %}{{ house.image.url }}{% else %}/static/img/placeholder-house.jpg{% endif %}"
+                            src="{% if house.image %}/media/{{ house.image }}{% else %}/static/img/placeholder-house.jpg{% endif %}"
                         /></a>
                         
                         <div class="location text-center">
diff --git a/gingerhouse/templates/houses/vote.html b/gingerhouse/templates/houses/vote.html
index f637328..5657597 100644
--- a/gingerhouse/templates/houses/vote.html
+++ b/gingerhouse/templates/houses/vote.html
@@ -8,18 +8,10 @@
 
 {% include 'includes/donate-please.html' %}
 
-<p>Please consider donating with your vote to support our very own Community Giving Fund in Orange County.</p>
+<p>Please consider making a donation with your vote to honor the hard work of our Gingerbread Creators.</p>
 <p>
-    Donations are being asked for the Community Giving Fund’s Emergency Housing Assistance program in Orange County, NC.
-    Every single dollar goes directly to keeping our community members secure in their housing situations. Each
-    donation will directly assist people experiencing housing emergencies in Orange County to remain stable. This
-    program was developed in partnership with local Governments and area nonprofits to prevent eviction and homelessness
-    for low income Orange County residents. So far in 2020, the program has served close to 1,000 residents to remain
-    stable in housing — and the need continues to grow.
-</p>
-<p class="small">
-    Want to make a larger, tax-deductible donation? <a href="https://stionlineepaymanager.suntrust.com/secure/welcome.asp?SunTrust_EBPP=ORANGECOUNTYNC">Click Here
-    for Community Giving Fund’s</a> direct donation portal through SunTrust. Select “Emergency Housing” as the FUND option in the payment.
+    All donations will be split 50/50 between the Hillsborough Arts Council (HAC) and Orange Congregations in Mission
+    (OCIM) to support the arts and our local food bank.
 </p>
 
 {% endblock %}
diff --git a/gingerhouse/templates/includes/button.html b/gingerhouse/templates/includes/button.html
index 7f90a76..07911f1 100644
--- a/gingerhouse/templates/includes/button.html
+++ b/gingerhouse/templates/includes/button.html
@@ -1 +1,3 @@
-<div class="gfm-embed" data-url="https://www.gofundme.com/f/homes-for-the-holidays-2020-orange-county-nc/widget/small/"></div><script defer src="https://www.gofundme.com/static/js/embed.js"></script>
\ No newline at end of file
+<a class="cv-donate-now" href="https://app.donorview.com/jnRZk" target="_blank">
+    <img src="https://donorview.blob.core.windows.net/imagestorage333/b3f28440-7cca-4c43-b01d-18eca8e62742/Buttons/button_481110b0b1cd4a45964587e5cb517aa8.png" />
+</a>
diff --git a/gingerhouse/templates/includes/donate-button.html b/gingerhouse/templates/includes/donate-button.html
index 7f90a76..07911f1 100644
--- a/gingerhouse/templates/includes/donate-button.html
+++ b/gingerhouse/templates/includes/donate-button.html
@@ -1 +1,3 @@
-<div class="gfm-embed" data-url="https://www.gofundme.com/f/homes-for-the-holidays-2020-orange-county-nc/widget/small/"></div><script defer src="https://www.gofundme.com/static/js/embed.js"></script>
\ No newline at end of file
+<a class="cv-donate-now" href="https://app.donorview.com/jnRZk" target="_blank">
+    <img src="https://donorview.blob.core.windows.net/imagestorage333/b3f28440-7cca-4c43-b01d-18eca8e62742/Buttons/button_481110b0b1cd4a45964587e5cb517aa8.png" />
+</a>
diff --git a/gingerhouse/templates/includes/donate-please.html b/gingerhouse/templates/includes/donate-please.html
index 9027455..bd049a0 100644
--- a/gingerhouse/templates/includes/donate-please.html
+++ b/gingerhouse/templates/includes/donate-please.html
@@ -1,10 +1,10 @@
 <div class="card donate-card" style="width: 100%; padding:2rem; margin-bottom: 4rem;">
         <div class="row">
             <div class="col-md-8 text-center">
-            <h3>Please consider a donation in any amount to <span class="peach">Community Giving Fund's Emergency Housing Assitance</span> for Orange County, NC</h3>
+            <h3>Please consider a donation in any amount to our fund for <span class="peach">Hillsborough Arts Council and Orange Congregations in Mission</span> for Orange County, NC</h3>
             </div>
         <div class="col-md-4 vertical-align">
             {% include 'includes/donate-button.html' %}        
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/gingerhouse/templates/includes/email-required-text.html b/gingerhouse/templates/includes/email-required-text.html
index c9be685..8cb1754 100644
--- a/gingerhouse/templates/includes/email-required-text.html
+++ b/gingerhouse/templates/includes/email-required-text.html
@@ -3,7 +3,7 @@ <h2>EMAIL ADDRESS REQUIREMENT</h2>
     
     We’re just a little group with a cheery gingerbread competition.
     
-    To make it easy for people to only vote once in each category, we are keeping track of votes with email addresses. 
+    To make it easy for people to only vote once per entry, we are keeping track of votes with email addresses.
     
     We have a temporary spreadsheet that will be deleted at the end of the month. We will not use your email for anything else or share it with anyone in any way. 
     
diff --git a/gingerhouse/templates/includes/home-text.html b/gingerhouse/templates/includes/home-text.html
index 12122d5..20fb1be 100644
--- a/gingerhouse/templates/includes/home-text.html
+++ b/gingerhouse/templates/includes/home-text.html
@@ -1,10 +1,7 @@
 <p>
-    <b>Please consider donating with your vote</b> to support our very own Community Giving Fund in Orange County.
+    We do this to have fun and bring cheer, but our goal is to raise funds for local nonprofits. <b>Please consider making a donation when you vote</b> to honor the hard work of our Gingerbread Creators
 </p>
 <p>
-    Donations are being asked for the Community Giving Fund's Emergency Housing Assistance program in Orange County, NC. <b>Every single dollar</b> goes directly to keeping our community members secure in their housing situations. Each donation will directly assist people experiencing housing emergencies in Orange County to remain stable. This program was developed in partnership with local Governments and area nonprofits to prevent eviction and homelessness for low income Orange County residents. <b>So far in 2020, the program has served close to 1,000 residents to remain stable in housing — and the need continues to grow.</b>
+    All donations will be split 50/50 between the Hillsborough Arts Council (HAC) and Orange Congregations in Mission
+    (OCIM) to support the arts and our local food bank.</b>
 </p>
-<!-- What is the URL for the direct donations -->
-<p class="small-text">
-    Want to make a larger, tax-deductible donation? <a href="https://stionlineepaymanager.suntrust.com/secure/welcome.asp?SunTrust_EBPP=ORANGECOUNTYNC">Click Here</a> for Community Giving Fund's direct dontation portal through SunTrust. Select <b>"Emergency Housing"</b> as the FUND option in the payment.
-</p>
\ No newline at end of file