Index: sdl-game.cpp
===================================================================
--- sdl-game.cpp	(revision c074f816bb2bb4e22016bed4c2547d2f76a26817)
+++ sdl-game.cpp	(revision 8aa48888f88cc8071fc870d4d9ab944f29847cb0)
@@ -1115,6 +1115,9 @@
 }
 
-void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                                  BufferSet& set) {
+   set.usages = usages;
+   set.properties = properties;
+
    set.buffers.resize(swapChainImageCount);
    set.memory.resize(swapChainImageCount);
@@ -1122,5 +1125,5 @@
 
    for (size_t i = 0; i < swapChainImageCount; i++) {
-      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, flags, properties, set.buffers[i], set.memory[i]);
+      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, usages, properties, set.buffers[i], set.memory[i]);
 
       set.infoSet[i].buffer = set.buffers[i];
Index: sdl-game.hpp
===================================================================
--- sdl-game.hpp	(revision c074f816bb2bb4e22016bed4c2547d2f76a26817)
+++ sdl-game.hpp	(revision 8aa48888f88cc8071fc870d4d9ab944f29847cb0)
@@ -20,8 +20,8 @@
 
 #include "consts.hpp"
+#include "game-gui-sdl.hpp"
 #include "vulkan-utils.hpp"
+#include "graphics-pipeline_vulkan.hpp"
 #include "vulkan-buffer.hpp"
-#include "graphics-pipeline_vulkan.hpp"
-#include "game-gui-sdl.hpp"
 
 using namespace glm;
@@ -59,4 +59,7 @@
    unsigned int objIndex;
 };
+
+// Currently using these as the dynamic UBO types as well
+// TODO: Rename them to something more general
 
 struct SSBO_ModelObject {
@@ -83,4 +86,6 @@
    vector<VkDeviceMemory> memory;
    vector<VkDescriptorBufferInfo> infoSet;
+   VkBufferUsageFlags usages;
+   VkMemoryPropertyFlags properties;
 };
 
@@ -289,5 +294,5 @@
       // TODO: Maybe move these to a different class, possibly VulkanBuffer or some new related class
 
-      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                            BufferSet& set);
 
Index: vulkan-game.cpp
===================================================================
--- vulkan-game.cpp	(revision c074f816bb2bb4e22016bed4c2547d2f76a26817)
+++ vulkan-game.cpp	(revision 8aa48888f88cc8071fc870d4d9ab944f29847cb0)
@@ -1942,6 +1942,9 @@
 }
 
-void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+void VulkanGame::createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                                  BufferSet& set) {
+   set.usages = usages;
+   set.properties = properties;
+
    set.buffers.resize(swapChainImageCount);
    set.memory.resize(swapChainImageCount);
@@ -1949,5 +1952,5 @@
 
    for (size_t i = 0; i < swapChainImageCount; i++) {
-      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, flags, properties, set.buffers[i], set.memory[i]);
+      VulkanUtils::createBuffer(device, physicalDevice, bufferSize, usages, properties, set.buffers[i], set.memory[i]);
 
       set.infoSet[i].buffer = set.buffers[i];
Index: vulkan-game.hpp
===================================================================
--- vulkan-game.hpp	(revision c074f816bb2bb4e22016bed4c2547d2f76a26817)
+++ vulkan-game.hpp	(revision 8aa48888f88cc8071fc870d4d9ab944f29847cb0)
@@ -23,8 +23,8 @@
 #include "consts.hpp"
 #include "utils.hpp"
+#include "game-gui-sdl.hpp"
 #include "vulkan-utils.hpp"
+#include "graphics-pipeline_vulkan.hpp"
 #include "vulkan-buffer.hpp"
-#include "graphics-pipeline_vulkan.hpp"
-#include "game-gui-sdl.hpp"
 
 using namespace glm;
@@ -102,4 +102,6 @@
    vector<VkDeviceMemory> memory;
    vector<VkDescriptorBufferInfo> infoSet;
+   VkBufferUsageFlags usages;
+   VkMemoryPropertyFlags properties;
 };
 
@@ -427,5 +429,5 @@
       // TODO: Maybe move these to a different class, possibly VulkanBuffer or some new related class
 
-      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, VkMemoryPropertyFlags properties,
+      void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags usages, VkMemoryPropertyFlags properties,
                            BufferSet& set);