diff --git a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo
index 7fc85b1101e3dabb65ca6f9ce55a7fb57c4faf63..e058d188b27930a5eedda847f4e469f90050c8a1 100644
Binary files a/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo and b/Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo differ
diff --git a/Zookeepers Trial/Assembly-CSharp.csproj b/Zookeepers Trial/Assembly-CSharp.csproj
index 60c1eeb02086a19a744cc10e1d23adb6fec44aa8..10fbeec0c09d0ecddae3b84e2910e64aabc3604c 100644
--- a/Zookeepers Trial/Assembly-CSharp.csproj	
+++ b/Zookeepers Trial/Assembly-CSharp.csproj	
@@ -55,6 +55,7 @@
      <Compile Include="Assets\Scripts\EnemyHealth.cs" />
      <Compile Include="Assets\Scripts\EnterDoor.cs" />
      <Compile Include="Assets\Scripts\MainMenu.cs" />
+     <Compile Include="Assets\Scripts\PlayerHealth.cs" />
      <Compile Include="Assets\Scripts\PlayerMovement.cs" />
      <Compile Include="Assets\Scripts\PlayerStats.cs" />
      <Compile Include="Assets\Scripts\ShopMenu.cs" />
diff --git a/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity b/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity
index e33e61c3ce4f92af184d94320f57638c2915a575..ff4d575e15c661918f9dbf04fad7a1eebd2c5b73 100644
Binary files a/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity and b/Zookeepers Trial/Assets/Scenes/shopBlacksmith.unity differ
diff --git a/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs b/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs
index 958fd6f646f2454e6d3f29863f1d503162b3d21a..b13e25ee0fe850d26c7055f0451bbea01ad04059 100644
--- a/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs	
+++ b/Zookeepers Trial/Assets/Scripts/WeaponShopButton.cs	
@@ -10,6 +10,7 @@ public class WeaponShopButton : MonoBehaviour {
     public Text wepName;
     public Text description;
     public Text cost;
+    public Image imageDisplay;
 	private WeaponStats[] weapons;
 
 	// Use this for initialization
@@ -31,6 +32,7 @@ public class WeaponShopButton : MonoBehaviour {
         wepName.text = weapons[weaponNumber].weaponName;
         description.text = weapons[weaponNumber].weaponDescription;
         cost.text = costToString;
+        imageDisplay.sprite = weapons[weaponNumber].image;
     }
 
     public void OnClick() {
@@ -39,4 +41,14 @@ public class WeaponShopButton : MonoBehaviour {
         // WILL DO LATER - for now, just change weapon
 		stats.setWeapon(weapons[weaponNumber]);
     }
+
+    // to display weapon stats when you hover over a weapon
+    public void HoverEnter() {
+
+    }
+
+    // to revert back to the original button
+    public void HoverExit() {
+
+    }
 }
diff --git a/Zookeepers Trial/Library/CurrentLayout.dwlt b/Zookeepers Trial/Library/CurrentLayout.dwlt
index f545f6119a98babb4215b045257bbb0b759dede8..1f348b17c66b8c9367776800b47ccd41192dcf58 100644
Binary files a/Zookeepers Trial/Library/CurrentLayout.dwlt and b/Zookeepers Trial/Library/CurrentLayout.dwlt differ
diff --git a/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt b/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt
index dbcea377284b30b883272ba60ec7fee50eff23b2..80f912c5baec36e89f4d49a2649afe95cf633c7d 100644
Binary files a/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt and b/Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt differ
diff --git a/Zookeepers Trial/Library/LastSceneManagerSetup.txt b/Zookeepers Trial/Library/LastSceneManagerSetup.txt
index 029e47d17cd0c7d94a149576cc18b03ed93ee680..9e6c3d18d794f5fbfe3b633a90fbe806fbd994c2 100644
--- a/Zookeepers Trial/Library/LastSceneManagerSetup.txt	
+++ b/Zookeepers Trial/Library/LastSceneManagerSetup.txt	
@@ -1,4 +1,4 @@
 sceneSetups:
-- path: Assets/Scenes/arena.unity
+- path: Assets/Scenes/shopBlacksmith.unity
   isLoaded: 1
   isActive: 1
diff --git a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
index bc6d0607438e204563287beca5f027750831598b..8036c7fd2d67abb7abbae54d51a238467cdf87d6 100644
Binary files a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
index 89640c2b5a02c3ec607537820b21ee50a923ab62..44ff14dae256462268d195ad4231a5ae64d6641c 100644
Binary files a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ
diff --git a/Zookeepers Trial/Library/assetDatabase3 b/Zookeepers Trial/Library/assetDatabase3
index e7f9d606e7ea4a6fb8d4ceb386eda43243b68b65..db2ca7bae882a3d5d0492ccceea5231a12db5036 100644
Binary files a/Zookeepers Trial/Library/assetDatabase3 and b/Zookeepers Trial/Library/assetDatabase3 differ
diff --git a/Zookeepers Trial/Library/expandedItems b/Zookeepers Trial/Library/expandedItems
index ec552c943638eb457d7d75f75738a20ef180dfa6..48412bfbc7f030ac074e40083f56548150cd953d 100644
Binary files a/Zookeepers Trial/Library/expandedItems and b/Zookeepers Trial/Library/expandedItems differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000
index 111269ce693295299d14c90523d5059e368ac884..8a8a8b441f159737fd314768d7cb55fd80f9cd6d 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000
index 6b2cb2f573598f504c2f9d8e4d0c813b767f6846..ba4969806050b951d95a227721f21b2a4034afab 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
index a6d58062abfd7605ae7a9193242e266b1a16fe77..5f07896cf7599a7b6e0558bfd93b504791d87450 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000
index da045a6862f4c0e4ef384c7d99b312f72eee869f..3f5b195c730bd911a0db9e55aa3eacfaa5c90324 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000
index ff8607d91ded1f414a77580208b68eb407416dfa..ecfece9a763d7e45635df57bb21943405e3d510f 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000
index d7493bb3c3228f489e04fbd939ecfa0435b73e08..d00dfae75aefb679d8bc653b4f4bade04be627fa 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000
index 32e01506becc4c931a8cc2291a38b6233f469689..495b5097ec39900b791a50de21bdb7a815ba2d09 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
index 5defd9c095afd775b32bb6d5055dfbce942afad3..aba0203a9259f83a0ec10a4f009964fcf53a3bd3 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000
index 458f2efc312f3192b54085ee726e52f7bfdc904b..ed83384d03bb4ff76fa1db8d46b82d57172ac4df 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000
index 3dd69fd86cfd4c59393f8b653e7addaefaa8f07c..d35d9d27eeff9dc8b0cc3050006f3d8902be8e05 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000
index c639460033e6c1e44fd802c322dadb8bc0cb4056..e76e0f410e44afff9b24c61295764dc17341fcf3 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000
index f58681d105d767ea99ef4da58e7f046ee84e9ad7..56685dfe5388c22112c8e1b79cbaf50b53fc8d48 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 b/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000
index a5ef8b8b3278e13f0ab844ac6522376add807b09..fc03413cc388d1fc2e465873507dbed07858e442 100644
Binary files a/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 and b/Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000
index f800bf3ddf25b543e0428f1e9952738e4df1d470..8c882a4befc6e8686f1b3f20f104d74152e058bc 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000
index 9c482a78690a91adb55447cace7d87bb05dbebe3..b40fd874cb865d63e2c866378308c25e304b246f 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000
index 22f1b1e0f304b5ba873b6ba19e908cfbdf87f439..3c397c5e4ef2e068e3fc536563da5e404486c04b 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 b/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000
index 6ebc6e21a7250233e68fb20307ae629545f59414..cf6396d959ad0cbe36333d9b35dbf150d4255b05 100644
Binary files a/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 and b/Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 differ
diff --git a/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298 b/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298
index 5a38d520b63422cdc100fc430e246858a480a53c..7b73661b1766c847ba8e826e6c4eed5cfdb297cb 100644
Binary files a/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298 and b/Zookeepers Trial/Library/metadata/a0/a0c28240c3bf98d4d94d9af7641b5298 differ
diff --git a/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698 b/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698
index 5186d3e37b0260e7c742e62a1fd225aae755fb2c..461ebb3e7ff48732a26678b280f6e3df85bb49b0 100644
Binary files a/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698 and b/Zookeepers Trial/Library/metadata/ce/ce84547236e7a12418b5733bfa1b9698 differ
diff --git a/Zookeepers Trial/Zookeepers Trial.sln b/Zookeepers Trial/Zookeepers Trial.sln
index 62a37f218a53fae88dde07d0540b132fa68fa057..19cd81b140d080ba64db87c8cf46cf6a85ebc4fa 100644
--- a/Zookeepers Trial/Zookeepers Trial.sln	
+++ b/Zookeepers Trial/Zookeepers Trial.sln	
@@ -1,7 +1,7 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zookeepers Trial.CSharp", "Zookeepers Trial.CSharp.csproj", "{D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{EB5C7B1C-EAE6-17E3-2D49-132C46FA7A42}") = "Zookeepers Trial", "Assembly-CSharp.csproj", "{A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,12 +9,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D55A8806-DC1A-C11C-2984-9B6CACEB1C5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6B8DDDF-E196-1FCB-6D57-7F9F959D6FCF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal