diff --git a/app/__pycache__/models.cpython-38.pyc b/app/__pycache__/models.cpython-38.pyc
index c013a72..d6a31fa 100644
Binary files a/app/__pycache__/models.cpython-38.pyc and b/app/__pycache__/models.cpython-38.pyc differ
diff --git a/app/migrations/0017_auto_20200411_2228.py b/app/migrations/0017_auto_20200411_2228.py
new file mode 100644
index 0000000..b95c425
--- /dev/null
+++ b/app/migrations/0017_auto_20200411_2228.py
@@ -0,0 +1,114 @@
+# Generated by Django 3.0.5 on 2020-04-11 22:28
+
+import app.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0016_auto_20200411_1851'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='experienceExalted',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Current Experience'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='experienceExaltedTotal',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Total Experience'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='limitBreak',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Limit Break'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='limitTrigger',
+            field=models.TextField(blank='False', max_length=1000, verbose_name='Limit Trigger'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='motesPeripheral',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Current Peripheral Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='motesPeripheralMax',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Maximum Peripheral Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='motesPersonal',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Current Personal Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltlunar',
+            name='motesPersonalMax',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Maximum Personal Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='experienceExalted',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Current Experience'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='experienceExaltedTotal',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Total Experience'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='limitBreak',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Limit Break'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='limitTrigger',
+            field=models.TextField(blank='False', max_length=1000, verbose_name='Limit Trigger'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='motesPeripheral',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Current Peripheral Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='motesPeripheralMax',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Maximum Peripheral Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='motesPersonal',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Current Personal Motes'),
+        ),
+        migrations.AddField(
+            model_name='characterexaltsolar',
+            name='motesPersonalMax',
+            field=app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Maximum Personal Motes'),
+        ),
+        migrations.CreateModel(
+            name='charmLunarShape',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', app.models.NameField(max_length=100, verbose_name='Name')),
+                ('levelEssence', app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Essence Level')),
+                ('levelKey', app.models.NamedIntegerField(default=0, help_text=None, verbose_name='Key Level')),
+                ('active', app.models.NamedBooleanField(default=False, verbose_name='Active?')),
+                ('description', app.models.DescriptionField(blank=True, max_length=1000, verbose_name='Description')),
+                ('character', app.models.NamedForeignKeyField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.characterExaltLunar', verbose_name='Character')),
+                ('modifierAbility', app.models.NamedManyToManyField(blank=True, to='app.modifierAbility', verbose_name='Abilities Modifiers')),
+                ('modifierAttribute', app.models.NamedManyToManyField(blank=True, to='app.modifierAttribute', verbose_name='Attribute Modifiers')),
+                ('modifierStatic', app.models.NamedManyToManyField(blank=True, to='app.modifierStatic', verbose_name='Statics Modifiers')),
+                ('rollConfiguration', app.models.NamedManyToManyField(blank=True, to='app.rollConfiguration', verbose_name='Roll Configurations')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/app/migrations/__pycache__/0017_auto_20200411_2228.cpython-38.pyc b/app/migrations/__pycache__/0017_auto_20200411_2228.cpython-38.pyc
new file mode 100644
index 0000000..d73a3c7
Binary files /dev/null and b/app/migrations/__pycache__/0017_auto_20200411_2228.cpython-38.pyc differ
diff --git a/app/models.py b/app/models.py
index f6f6daf..a711c03 100644
--- a/app/models.py
+++ b/app/models.py
@@ -620,12 +620,18 @@ class characterExaltBase(characterBase):
         abstract = True
 
     #============= MOTES ==============#
+    motesPersonalMax = NamedIntegerField("Maximum Personal Motes")
+    motesPersonal = NamedIntegerField("Current Personal Motes")
+    motesPeripheralMax = NamedIntegerField("Maximum Peripheral Motes")
+    motesPeripheral = NamedIntegerField("Current Peripheral Motes")
 
     #============= LIMIT ==============#
+    limitTrigger = models.TextField(verbose_name="Limit Trigger", blank="False", max_length=1000)
+    limitBreak = NamedIntegerField("Limit Break")
 
     #======= EXALTED EXPERIENCE =======#
-
-    pass
+    experienceExaltedTotal = NamedIntegerField("Total Experience")
+    experienceExalted = NamedIntegerField("Current Experience")
 
 class characterExaltSolar(characterExaltBase):
 
@@ -643,6 +649,8 @@ class characterExaltLunar(characterExaltBase):
     attributeFavored = MultiChoiceField("Favoured Attributes", ATTRIBUTES)
 
     #========= SHAPESHIFTING ==========#
+    # Reverse relation
+    # .charmLunarShape_set.all()
 
     #============= CHARMS =============#
     # Reverse relation
@@ -769,6 +777,10 @@ class charmLunar(charmBase):
     attribute = SingleChoiceField("Key Attribute", ATTRIBUTES)
     character = NamedForeignKeyField("Character", characterExaltLunar)
 
+class charmLunarShape(charmBase):
+    description = DescriptionField()
+    character = NamedForeignKeyField("Character", characterExaltLunar)
+
 #==============================================================================#
 #----------------------------------- MERITS -----------------------------------#
 #==============================================================================#