diff --git a/src/opencl_handle.cc b/src/opencl_handle.cc
index d8303c2..830fc88 100644
--- a/src/opencl_handle.cc
+++ b/src/opencl_handle.cc
@@ -1,12 +1,12 @@
 #include "opencl_handle.h"
 
-std::unique_ptr<OpenCLContext> OpenCLContext::instance_ = {};
+OpenCLContext::Ptr OpenCLContext::instance_ = {};
 
-OpenCLHandle::OpenCLHandle() {
+OpenCLContext::OpenCLHandle::OpenCLHandle() {
   // TODO
 }
 
-OpenCLHandle::~OpenCLHandle() { OpenCLContext::CheckRefCount(); }
+OpenCLContext::OpenCLHandle::~OpenCLHandle() { OpenCLContext::CheckRefCount(); }
 
 OpenCLContext::OpenCLContext() {
   // TODO
@@ -16,7 +16,7 @@ OpenCLContext::~OpenCLContext() {
   // TODO
 }
 
-OpenCLHandle::Ptr OpenCLContext::GetHandle() {
+OpenCLContext::OpenCLHandle::Ptr OpenCLContext::GetHandle() {
   if (!instance_) {
     // cannot use make_unique due to private constructor
     instance_ = std::unique_ptr<OpenCLContext>(new OpenCLContext());
diff --git a/src/opencl_handle.h b/src/opencl_handle.h
index c0584c6..43460d4 100644
--- a/src/opencl_handle.h
+++ b/src/opencl_handle.h
@@ -3,32 +3,37 @@
 
 #include <memory>
 
-class OpenCLHandle {
- public:
-  typedef std::shared_ptr<OpenCLHandle> Ptr;
-  typedef std::weak_ptr<OpenCLHandle> WeakPtr;
-
-  ~OpenCLHandle();
-
-  // no copy
-  OpenCLHandle(const OpenCLHandle &other) = delete;
-  OpenCLHandle &operator=(const OpenCLHandle &other) = delete;
-
-  // allow move
-  OpenCLHandle(OpenCLHandle &&other) = default;
-  OpenCLHandle &operator=(OpenCLHandle &&other) = default;
-
-  // TODO add functions here that allow creating/deleting/using kernel function
-  // programs
-
- private:
-  friend class OpenCLContext;
-
-  OpenCLHandle();
-};
-
 class OpenCLContext {
  public:
+  typedef std::shared_ptr<OpenCLContext> Ptr;
+  typedef std::weak_ptr<OpenCLContext> WeakPtr;
+
+  class OpenCLHandle {
+   public:
+    typedef std::shared_ptr<OpenCLHandle> Ptr;
+    typedef std::weak_ptr<OpenCLHandle> WeakPtr;
+
+    ~OpenCLHandle();
+
+    // no copy
+    OpenCLHandle(const OpenCLHandle &other) = delete;
+    OpenCLHandle &operator=(const OpenCLHandle &other) = delete;
+
+    // allow move
+    OpenCLHandle(OpenCLHandle &&other) = default;
+    OpenCLHandle &operator=(OpenCLHandle &&other) = default;
+
+    // TODO add functions here that allow creating/deleting/using kernel
+    // function programs
+
+   private:
+    friend class OpenCLContext;
+
+    OpenCLHandle();
+
+    OpenCLContext::WeakPtr opencl_ptr_;
+  };
+
   ~OpenCLContext();
 
   // no copy
@@ -42,11 +47,9 @@ class OpenCLContext {
   OpenCLHandle::Ptr GetHandle();
 
  private:
-  friend class OpenCLHandle;
-
   OpenCLContext();
 
-  static std::unique_ptr<OpenCLContext> instance_;
+  static Ptr instance_;
   OpenCLHandle::WeakPtr weak_handle_;
 
   static void CheckRefCount();