diff --git a/kraken/KRContext.cpp b/kraken/KRContext.cpp
index ceb9808..f0287ab 100755
--- a/kraken/KRContext.cpp
+++ b/kraken/KRContext.cpp
@@ -694,6 +694,8 @@ void KRContext::doStreaming()
       device.streamStart();
     }
 
+    // TODO - Ensure that each iteration does not exhaust the currently fixed 256MB staging buffer
+
     long streaming_start_frame = m_current_frame;
 
     long memoryRemaining = KRENGINE_GPU_MEM_TARGET;
diff --git a/kraken/KRMeshManager.cpp b/kraken/KRMeshManager.cpp
index 2a372b2..c042172 100755
--- a/kraken/KRMeshManager.cpp
+++ b/kraken/KRMeshManager.cpp
@@ -570,22 +570,14 @@ void KRMeshManager::KRVBOData::load()
       device.createBuffer(
         m_data->getSize(),
         VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT,
-        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+        VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
         &allocation.vertex_buffer,
         &allocation.vertex_allocation
 #if KRENGINE_DEBUG_GPU_LABELS
         , debug_label
 #endif // KRENGINE_DEBUG_GPU_LABELS
       );
-
-      // TODO - Use staging buffers     
-
-      void* mappedData = nullptr;
-      m_data->lock();
-      vmaMapMemory(allocator, allocation.vertex_allocation, &mappedData);
-      memcpy(mappedData, m_data->getStart(), m_data->getSize());
-      vmaUnmapMemory(allocator, allocation.vertex_allocation);
-      m_data->unlock();
+      device.streamUpload(*m_data, allocation.vertex_buffer);
 
       if (m_index_data->getSize() > 0) {
 #if KRENGINE_DEBUG_GPU_LABELS
@@ -594,20 +586,14 @@ void KRMeshManager::KRVBOData::load()
         device.createBuffer(
           m_index_data->getSize(),
           VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT,
-          VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT,
+          VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
           &allocation.index_buffer,
           &allocation.index_allocation
 #if KRENGINE_DEBUG_GPU_LABELS
           , debug_label
 #endif
         );
-
-        mappedData = nullptr;
-        m_index_data->lock();
-        vmaMapMemory(allocator, allocation.index_allocation, &mappedData);
-        memcpy(mappedData, m_index_data->getStart(), m_index_data->getSize());
-        vmaUnmapMemory(allocator, allocation.index_allocation);
-        m_index_data->unlock();
+        device.streamUpload(*m_index_data, allocation.index_buffer);
       }
     }