diff --git a/ZeldaTOTK/Basic.cs b/ZeldaTOTK/Basic.cs
index 81b1747..e3e0675 100644
--- a/ZeldaTOTK/Basic.cs
+++ b/ZeldaTOTK/Basic.cs
@@ -14,7 +14,7 @@ public uint Heart
 			set
 			{
 				if (value < 1) value = 1;
-				if (value > 20) value = 20;
+				if (value > 40) value = 40;
 				SaveData.Instance().WriteNumber(0x29A44, 4, value);
 			}
 		}
@@ -44,6 +44,21 @@ public uint Rupee
 			}
 		}
 
+		public float Battery
+		{
+			get
+			{
+				return BitConverter.ToSingle(SaveData.Instance().ReadValue(0x34FC4, 4));
+			}
+
+			set
+			{
+				if (value < 3000) value = 3000;
+				if (value > 24000) value = 24000;
+				SaveData.Instance().WriteValue(0x34FC4, BitConverter.GetBytes(value));
+			}
+		}
+
 		public uint Arrow
 		{
 			get => SaveData.Instance().ReadNumber(0x47030, 4);
@@ -53,5 +68,15 @@ public uint Arrow
 				SaveData.Instance().WriteNumber(0x47030, 4, value);
 			}
 		}
+
+		public uint EnergyCrystal
+		{
+			get => SaveData.Instance().ReadNumber(0x4EBF4, 4);
+			set
+			{
+				if (value > 999) value = 999;
+				SaveData.Instance().WriteNumber(0x4EBF4, 4, value);
+			}
+		}
 	}
 }
diff --git a/ZeldaTOTK/HeartConverter.cs b/ZeldaTOTK/HeartConverter.cs
index 65cdb42..fb8e3fe 100644
--- a/ZeldaTOTK/HeartConverter.cs
+++ b/ZeldaTOTK/HeartConverter.cs
@@ -18,8 +18,10 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
 		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
 		{
-			var count = (uint)(int)value * 4;
-			return count;
+			uint count = 0;
+			if (!uint.TryParse(value.ToString(), out count)) return 0;
+
+			return count * 4;
 		}
 	}
 }
diff --git a/ZeldaTOTK/MainWindow.xaml b/ZeldaTOTK/MainWindow.xaml
index 081a894..0731b47 100644
--- a/ZeldaTOTK/MainWindow.xaml
+++ b/ZeldaTOTK/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:ZeldaTOTK"
         mc:Ignorable="d"
 		WindowStartupLocation="CenterScreen"
-        Title="MainWindow" Height="450" Width="650">
+        Title="Switch The Legend of Zelda Tears of the Kingdom SaveDate Editor" Height="450" Width="650">
 	<Window.DataContext>
 		<local:ViewModel/>
 	</Window.DataContext>
@@ -28,7 +28,10 @@
 						<RowDefinition/>
 						<RowDefinition/>
 						<RowDefinition/>
-						<RowDefinition Height="8*"/>
+						<RowDefinition/>
+						<RowDefinition/>
+						<RowDefinition/>
+						<RowDefinition Height="6*"/>
 					</Grid.RowDefinitions>
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition/>
@@ -40,13 +43,29 @@
 					<Label Content="Rupee"/>
 					<TextBox Grid.Column="1" Text="{Binding Basic.Rupee, UpdateSourceTrigger=PropertyChanged}"/>
 					<Label Grid.Row="1" Content="Heart"/>
-					<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Basic.Heart, UpdateSourceTrigger=PropertyChanged}"/>
+					<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Basic.Heart, Converter={StaticResource HeartConverter}, UpdateSourceTrigger=PropertyChanged}"/>
 					<Label Grid.Row="2" Content="Stamina"/>
 					<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Basic.Stamina, UpdateSourceTrigger=PropertyChanged}"/>
-					<Label Grid.Row="3" Content="Arrow"/>
-					<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding Basic.Arrow, UpdateSourceTrigger=PropertyChanged}"/>
+					<Label Grid.Row="3" Content="EnergyCrystal"/>
+					<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding Basic.EnergyCrystal, UpdateSourceTrigger=PropertyChanged}"/>
+					<Label Grid.Row="4" Content="Battery"/>
+					<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding Basic.Battery, UpdateSourceTrigger=PropertyChanged}"/>
+					<Label Grid.Row="6" Content="Arrow"/>
+					<TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Basic.Arrow, UpdateSourceTrigger=PropertyChanged}"/>
 				</Grid>
 			</TabItem>
+			<TabItem Header="Armor">
+				<ListBox ItemsSource="{Binding Armors}">
+					<ListBox.ItemTemplate>
+						<DataTemplate>
+							<StackPanel Orientation="Horizontal">
+								<Label Content="ID"/>
+								<TextBox Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Width="250"/>
+							</StackPanel>
+						</DataTemplate>
+					</ListBox.ItemTemplate>
+				</ListBox>
+			</TabItem>
 			<TabItem Header="Bow">
 				<DockPanel>
 					<Button DockPanel.Dock="Bottom" Content="Append" Command="{Binding IncrementLimitCountCommand}"
diff --git a/ZeldaTOTK/ViewModel.cs b/ZeldaTOTK/ViewModel.cs
index d8d6465..c9e1e6c 100644
--- a/ZeldaTOTK/ViewModel.cs
+++ b/ZeldaTOTK/ViewModel.cs
@@ -13,6 +13,7 @@ internal class ViewModel : INotifyPropertyChanged
 	{
 		public uint ItemCount { get; set; } = 999;
 		public Basic? Basic { get; private set; } = new Basic();
+		public ObservableCollection<Item> Armors { get; private set; } = new ObservableCollection<Item>();
 		public ObservableCollection<Item> Materials { get; private set; } = new ObservableCollection<Item>();
 		public ObservableCollection<Item> Foods { get; private set; } = new ObservableCollection<Item>();
 		public ObservableCollection<Item> Capsules { get; private set; } = new ObservableCollection<Item>();
@@ -41,10 +42,19 @@ private void LoadFile(Object? obj)
 			if (dlg.ShowDialog() == false) return;
 			SaveData.Instance().Open(dlg.FileName);
 
+			Armors.Clear();
 			Materials.Clear();
 			Foods.Clear();
+			Capsules.Clear();
 
-			for(uint index = 0; index < 400; index++)
+			for (uint index = 0; index < 400; index++)
+			{
+				Item item = new Item(0, 0x61BF8 + index * 64);
+				if (String.IsNullOrEmpty(item.Name)) break;
+				Armors.Add(item);
+			}
+
+			for (uint index = 0; index < 400; index++)
 			{
 				Item item = new Item(0x477E0 + index * 4, 0xAFC30 + index * 64);
 				if (item.Count == 0xFFFFFFFF) break;