diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
index 53740f9..3168124 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
@@ -26,6 +26,7 @@ import com.majinnaibu.monstercards.utils.Logger;
 import com.majinnaibu.monstercards.utils.TextChangedListener;
 
 public class EditLanguagesFragment extends MCFragment {
+    // TODO: Make the swipe to delete not happen for the header
     private EditMonsterViewModel mViewModel;
     private ViewHolder mHolder;
 
@@ -95,4 +96,4 @@ public class EditLanguagesFragment extends MCFragment {
             this.addLanguage = root.findViewById(R.id.add_language);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
index 8cd9d76..99c6152 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
@@ -24,6 +24,7 @@ import com.majinnaibu.monstercards.utils.Logger;
 import com.majinnaibu.monstercards.utils.TextChangedListener;
 
 public class EditSkillFragment extends MCFragment {
+    // TODO: when this view is shown select focus on the name edit text and select it's contents
     private EditMonsterViewModel mEditMonsterViewModel;
     private EditSkillViewModel mViewModel;
     private ViewHolder mHolder;
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java
index 0610a18..e331c95 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java
@@ -21,6 +21,7 @@ import com.majinnaibu.monstercards.utils.Logger;
 import com.majinnaibu.monstercards.utils.TextChangedListener;
 
 public class EditStringFragment extends MCFragment {
+    // TODO: when this fragment is shown focus on the edit text and select it's contents
     private EditMonsterViewModel mEditMonsterViewModel;
     private EditStringViewModel mViewModel;
     private ViewHolder mHolder;
diff --git a/app/src/main/res/layout/fragment_edit_armor.xml b/app/src/main/res/layout/fragment_edit_armor.xml
index 765d887..d5da1bf 100644
--- a/app/src/main/res/layout/fragment_edit_armor.xml
+++ b/app/src/main/res/layout/fragment_edit_armor.xml
@@ -15,6 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <!-- // TODO: Make this a stepper instead of a text field -->
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,6 +39,7 @@
             android:text="@string/label_has_a_shield"
             android:textSize="20sp" />
 
+        <!-- // TODO: Make this a stepper instead of a text field -->
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -68,4 +70,4 @@
                 tools:text="John Doe" />
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_edit_basic_info.xml b/app/src/main/res/layout/fragment_edit_basic_info.xml
index 2ae3f11..a2999b5 100644
--- a/app/src/main/res/layout/fragment_edit_basic_info.xml
+++ b/app/src/main/res/layout/fragment_edit_basic_info.xml
@@ -86,7 +86,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <!-- Hit Dice (int) -->
-
+        <!-- // TODO: Make this a stepper instead of a text field -->
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"