diff --git a/include/gfx_device.hpp b/include/gfx_device.hpp
index d64daea..949da86 100644
--- a/include/gfx_device.hpp
+++ b/include/gfx_device.hpp
@@ -10,13 +10,13 @@ struct SDL_Window;
 
 namespace engine::gfx {
 	
-	struct ENGINE_API Device {
+	struct ENGINE_API GFXDevice {
 
-		Device(AppInfo appInfo, SDL_Window* window);
+		GFXDevice(AppInfo appInfo, SDL_Window* window);
 
-		Device(const Device&) = delete;
-		Device& operator=(const Device&) = delete;
-		~Device();
+		GFXDevice(const GFXDevice&) = delete;
+		GFXDevice& operator=(const GFXDevice&) = delete;
+		~GFXDevice();
 
 	private:
 		class Impl;
diff --git a/src/gfx_device_vulkan.cpp b/src/gfx_device_vulkan.cpp
index 280cd69..2586eb8 100644
--- a/src/gfx_device_vulkan.cpp
+++ b/src/gfx_device_vulkan.cpp
@@ -32,33 +32,40 @@ namespace engine::gfx {
 		return requiredExtensions;
 	}	
 
-	class Device::Impl {
+	static VkSurfaceKHR createSurface(SDL_Window* window, VkInstance instance)
+	{
+		VkSurfaceKHR surface;
+
+		if (SDL_Vulkan_CreateSurface(window, instance, &surface) == false) {
+			throw std::runtime_error("Unable to create window surface");
+		}
+
+		return surface;
+	}
+
+	class GFXDevice::Impl {
 
 	public:
 		Impl(AppInfo appInfo, SDL_Window* window)
 		{
 #ifdef NDEBUG
-			// release mode; don't use validation layer
+			// release mode: don't use validation layer
 			m_layerInfo = std::make_unique<LayerInfo>(false);
 #else
-			// debug mode; use validation layer
+			// debug mode: use validation layer
 			m_layerInfo = std::make_unique<LayerInfo>(true);
 #endif
 			m_instance = std::make_shared<Instance>(appInfo, *m_layerInfo, getRequiredVulkanExtensions(window));
-
 			volkLoadInstanceOnly(m_instance->getHandle());
-
 			m_debugMessenger = std::make_unique<DebugMessenger>(m_instance);
+
+			m_surface = std::make_unique<Surface>(window, m_instance);
+
 			m_device = std::make_unique<Device>(m_instance);
-
-			volkLoadDevice(m_device->getHandle());
-
 		}
 
 	private:
 
-//		VkSurfaceKHR m_surface;
-
 		struct LayerInfo {
 
 			LayerInfo(bool useValidation)
@@ -162,6 +169,7 @@ namespace engine::gfx {
 			Instance& operator=(const Instance&) = delete;
 			~Instance()
 			{
+				TRACE("Destroying instance...");
 				vkDestroyInstance(m_handle, nullptr);
 			}
 
@@ -190,6 +198,7 @@ namespace engine::gfx {
 			DebugMessenger& operator=(const DebugMessenger&) = delete;
 			~DebugMessenger()
 			{
+				TRACE("Destroying debug messenger...");
 				vkDestroyDebugUtilsMessengerEXT(m_instance->getHandle(), m_messengerHandle, nullptr);
 			}
 
@@ -277,6 +286,28 @@ namespace engine::gfx {
 
 		};
 
+		class Surface {
+
+		public:
+			Surface(SDL_Window* window, std::shared_ptr<Instance> instance) : m_instance(instance)
+			{
+				m_handle = createSurface(window, instance->getHandle());
+			}
+			Surface(const Surface&) = delete;
+			Surface& operator=(const Surface&) = delete;
+
+			~Surface()
+			{
+				TRACE("Destroying surface...");
+				vkDestroySurfaceKHR(m_instance->getHandle(), m_handle, nullptr);
+			}
+
+		private:
+			std::shared_ptr<Instance> m_instance;
+			VkSurfaceKHR m_handle;
+
+		};
+
 		class Device {
 
 		public:
@@ -340,7 +371,7 @@ namespace engine::gfx {
 
 				VkPhysicalDeviceProperties devProps;
 				vkGetPhysicalDeviceProperties(physicalDevice, &devProps);
-				TRACE("Selected physical device: {}", devProps.deviceName);
+				INFO("Selected physical device: {}", devProps.deviceName);
 
 				// queue families
 
@@ -411,12 +442,18 @@ namespace engine::gfx {
 				if (res != VK_SUCCESS) {
 					throw std::runtime_error("Unable to create Vulkan logical device, error code: " + std::to_string(res));
 				}
+
+				volkLoadDevice(m_handle);
+
+				vkGetDeviceQueue(m_handle, graphicsFamilyIndex.value(), 0, &graphicsQueue);
+
 			}
 			Device(const Device&) = delete;
 			Device& operator=(const Device&) = delete;
 
 			~Device()
 			{
+				TRACE("Destroying device...");
 				vkDestroyDevice(m_handle, nullptr);
 			}
 
@@ -429,27 +466,19 @@ namespace engine::gfx {
 			std::shared_ptr<Instance> m_instance;
 			VkDevice m_handle;
 
+			VkQueue graphicsQueue = VK_NULL_HANDLE;
+
 		};
 
 		std::unique_ptr<LayerInfo> m_layerInfo;
 		std::shared_ptr<Instance> m_instance;
 		std::unique_ptr<DebugMessenger> m_debugMessenger; // uses instance
+		std::unique_ptr<Surface> m_surface; // uses instance
 		std::unique_ptr<Device> m_device; // uses instance
 
-/*
-
-		void createSurface(SDL_Window* window)
-		{
-			if (SDL_Vulkan_CreateSurface(window, m_instance, &m_surface) == false) {
-				CRITICAL("Unable to create window surface");
-				throw std::runtime_error("Unable to create window surface");
-			}
-		}
-*/	
-
 	};
 
-	Device::Device(AppInfo appInfo, SDL_Window* window)
+	GFXDevice::GFXDevice(AppInfo appInfo, SDL_Window* window)
 	{
 		VkResult res;
 		res = volkInitialize();
@@ -463,10 +492,11 @@ namespace engine::gfx {
 
 	}
 
-	Device::~Device()
+	GFXDevice::~GFXDevice()
 	{
+		TRACE("Destroying GFXDevice...");
 	}
 
 }
 
-#endif
\ No newline at end of file
+#endif